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

another fix for --innodb-trx* name conflict

Browse Source
This commit is contained in:
Sergei Golubchik 2012-03-14 19:47:15 +01:00
parent e3e2b4e1d1
commit c3c14a069b
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/disabled.def
View File

@ -9,3 +9,5 @@
# Do not use any TAB characters for whitespace. # Do not use any TAB characters for whitespace.
# #
############################################################################## ##############################################################################
innodb_bug12400341: variable innodb_trx_rseg_n_slots_debug is removed in MariaDB

3
mysql-test/suite/sys_vars/disabled.def
View File

@ -9,3 +9,6 @@
# Do not use any TAB characters for whitespace. # Do not use any TAB characters for whitespace.
# #
############################################################################## ##############################################################################
innodb_trx_rseg_n_slots_debug_basic: variable innodb_trx_rseg_n_slots_debug is removed in MariaDB

4
storage/innobase/handler/ha_innodb.cc
View File

@ -11647,14 +11647,13 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
MYSQL_SYSVAR(purge_threads), MYSQL_SYSVAR(purge_threads),
MYSQL_SYSVAR(purge_batch_size), MYSQL_SYSVAR(purge_batch_size),
MYSQL_SYSVAR(rollback_segments), MYSQL_SYSVAR(rollback_segments),
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG_never /* disable this flag. --innodb-trx becomes ambiguous */
MYSQL_SYSVAR(trx_rseg_n_slots_debug), MYSQL_SYSVAR(trx_rseg_n_slots_debug),
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
NULL NULL
}; };
mysql_declare_plugin(innobase) mysql_declare_plugin(innobase)
i_s_innodb_trx, // this need to be before SE plugin, otherwise --innodb-trx-rseg-n-slots-debug shadows --innodb-trx option
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&innobase_storage_engine, &innobase_storage_engine,
@ -11670,6 +11669,7 @@ i_s_innodb_trx, // this need to be before SE plugin, otherwise --innodb-trx-rseg
NULL, /* reserved */ NULL, /* reserved */
0, /* flags */ 0, /* flags */
}, },
i_s_innodb_trx,
i_s_innodb_locks, i_s_innodb_locks,
i_s_innodb_lock_waits, i_s_innodb_lock_waits,
i_s_innodb_cmp, i_s_innodb_cmp,