1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatic merge with 5.1-release

Browse Source
This commit is contained in:
Michael Widenius 2010-11-30 09:25:33 +02:00
commit 6f279f4014
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -123,6 +123,7 @@ then
fi fi
# Whether the maintainer mode should be enabled. # Whether the maintainer mode should be enabled.
# Note that this uses $with_debug and $with_valgrind
MY_MAINTAINER_MODE MY_MAINTAINER_MODE
# Canonicalize the configuration name. # Canonicalize the configuration name.

1
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
View File

@ -2,6 +2,7 @@
# Bug #56680 InnoDB may return wrong results from a case-insensitive index # Bug #56680 InnoDB may return wrong results from a case-insensitive index
# #
-- source include/have_innodb_plugin.inc -- source include/have_innodb_plugin.inc
-- source include/not_valgrind.inc
-- disable_query_log -- disable_query_log
SET @tx_isolation_orig = @@tx_isolation; SET @tx_isolation_orig = @@tx_isolation;

2
mysys/charset.c
View File

@ -202,6 +202,7 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs)
} }
#if defined(HAVE_UCA_COLLATIONS) && (defined(HAVE_CHARSET_ucs2) || defined(HAVE_CHARSET_utf8))
static void static void
copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from) copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from)
{ {
@ -215,6 +216,7 @@ copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from)
to->state|= MY_CS_AVAILABLE | MY_CS_LOADED | to->state|= MY_CS_AVAILABLE | MY_CS_LOADED |
MY_CS_STRNXFRM | MY_CS_UNICODE; MY_CS_STRNXFRM | MY_CS_UNICODE;
} }
#endif
static int add_collation(CHARSET_INFO *cs) static int add_collation(CHARSET_INFO *cs)

6
storage/xtradb/srv/srv0srv.c
View File

@ -1125,7 +1125,7 @@ retry:
enter_innodb_with_tickets(trx); enter_innodb_with_tickets(trx);
return; return;
} }
os_atomic_increment_lint(&srv_conc_n_threads, -1); (void) os_atomic_increment_lint(&srv_conc_n_threads, -1);
} }
if (!has_yielded) if (!has_yielded)
{ {
@ -1155,7 +1155,7 @@ retry:
static void static void
srv_conc_exit_innodb_timer_based(trx_t* trx) 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->declared_to_be_inside_innodb = FALSE;
trx->n_tickets_to_enter_innodb = 0; trx->n_tickets_to_enter_innodb = 0;
return; return;
@ -1362,7 +1362,7 @@ srv_conc_force_enter_innodb(
ut_ad(srv_conc_n_threads >= 0); ut_ad(srv_conc_n_threads >= 0);
#ifdef HAVE_ATOMIC_BUILTINS #ifdef HAVE_ATOMIC_BUILTINS
if (srv_thread_concurrency_timer_based) { 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->declared_to_be_inside_innodb = TRUE;
trx->n_tickets_to_enter_innodb = 1; trx->n_tickets_to_enter_innodb = 1;
return; return;