[Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2980)

Michael Widenius michael.widenius at gmail.com
Tue Nov 30 09:16:28 EET 2010


#At lp:maria based on revid:monty at mysql.com-20101129095557-cmlr2p03en5yf0jl

 2980 Michael Widenius	2010-11-30 [merge]
      Automatic merge with 5.1-release
      modified:
        configure.in
        mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
        mysys/charset.c
        storage/xtradb/srv/srv0srv.c

=== modified file 'configure.in'
--- a/configure.in	2010-11-29 09:27:52 +0000
+++ b/configure.in	2010-11-29 23:14:34 +0000
@@ -123,6 +123,7 @@ then
 fi
 
 # Whether the maintainer mode should be enabled.
+# Note that this uses $with_debug and $with_valgrind
 MY_MAINTAINER_MODE
 
 # Canonicalize the configuration name.

=== modified file 'mysql-test/suite/innodb_plugin/t/innodb_bug56680.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test	2010-10-19 06:04:15 +0000
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test	2010-11-29 23:14:34 +0000
@@ -2,6 +2,7 @@
 # Bug #56680 InnoDB may return wrong results from a case-insensitive index
 #
 -- source include/have_innodb_plugin.inc
+-- source include/not_valgrind.inc
 
 -- disable_query_log
 SET @tx_isolation_orig = @@tx_isolation;

=== modified file 'mysys/charset.c'
--- a/mysys/charset.c	2010-04-28 12:52:24 +0000
+++ b/mysys/charset.c	2010-11-29 23:14:34 +0000
@@ -202,6 +202,7 @@ static my_bool simple_cs_is_full(CHARSET
 }
 
 
+#if defined(HAVE_UCA_COLLATIONS) && (defined(HAVE_CHARSET_ucs2) || defined(HAVE_CHARSET_utf8))
 static void
 copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from)
 {
@@ -215,6 +216,7 @@ copy_uca_collation(CHARSET_INFO *to, CHA
   to->state|= MY_CS_AVAILABLE | MY_CS_LOADED |
               MY_CS_STRNXFRM  | MY_CS_UNICODE;
 }
+#endif
 
 
 static int add_collation(CHARSET_INFO *cs)

=== modified file 'storage/xtradb/srv/srv0srv.c'
--- a/storage/xtradb/srv/srv0srv.c	2010-11-24 13:04:38 +0000
+++ b/storage/xtradb/srv/srv0srv.c	2010-11-29 23:14:34 +0000
@@ -1125,7 +1125,7 @@ retry:
 			enter_innodb_with_tickets(trx);
 			return;
 		}
-		os_atomic_increment_lint(&srv_conc_n_threads, -1);
+		(void) os_atomic_increment_lint(&srv_conc_n_threads, -1);
 	}
 	if (!has_yielded)
 	{
@@ -1155,7 +1155,7 @@ retry:
 static void
 srv_conc_exit_innodb_timer_based(trx_t* trx)
 {
-	os_atomic_increment_lint(&srv_conc_n_threads, -1);
+        (void) os_atomic_increment_lint(&srv_conc_n_threads, -1);
 	trx->declared_to_be_inside_innodb = FALSE;
 	trx->n_tickets_to_enter_innodb = 0;
 	return;
@@ -1362,7 +1362,7 @@ srv_conc_force_enter_innodb(
 	ut_ad(srv_conc_n_threads >= 0);
 #ifdef HAVE_ATOMIC_BUILTINS
 	if (srv_thread_concurrency_timer_based) {
-		os_atomic_increment_lint(&srv_conc_n_threads, 1);
+                (void) os_atomic_increment_lint(&srv_conc_n_threads, 1);
 		trx->declared_to_be_inside_innodb = TRUE;
 		trx->n_tickets_to_enter_innodb = 1;
 		return;



More information about the commits mailing list