diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-14 19:47:15 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-14 19:47:15 +0100 |
| commit | e8661e73bf288d6103b86672362ff45e358836e2 (patch) | |
| tree | ea75380c3ef060e6105c4fb21e2516cb7716131d | |
| parent | 6b86de1281940929dbad90de73b92b53272d3b34 (diff) | |
| download | mariadb-git-e8661e73bf288d6103b86672362ff45e358836e2.tar.gz | |
another fix for --innodb-trx* name conflictmariadb-5.5.21-beta
| -rw-r--r-- | mysql-test/suite/innodb/disabled.def | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/disabled.def | 3 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/disabled.def b/mysql-test/suite/innodb/disabled.def index 888298bbb09..0e7cd067056 100644 --- a/mysql-test/suite/innodb/disabled.def +++ b/mysql-test/suite/innodb/disabled.def @@ -9,3 +9,5 @@ # Do not use any TAB characters for whitespace. # ############################################################################## + +innodb_bug12400341: variable innodb_trx_rseg_n_slots_debug is removed in MariaDB diff --git a/mysql-test/suite/sys_vars/disabled.def b/mysql-test/suite/sys_vars/disabled.def index 888298bbb09..319a6d970aa 100644 --- a/mysql-test/suite/sys_vars/disabled.def +++ b/mysql-test/suite/sys_vars/disabled.def @@ -9,3 +9,6 @@ # 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 + diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 2dfbb4a0734..9fb7dd79f3d 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -11647,14 +11647,13 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(purge_threads), MYSQL_SYSVAR(purge_batch_size), 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), #endif /* UNIV_DEBUG */ NULL }; 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, &innobase_storage_engine, @@ -11670,6 +11669,7 @@ i_s_innodb_trx, // this need to be before SE plugin, otherwise --innodb-trx-rseg NULL, /* reserved */ 0, /* flags */ }, +i_s_innodb_trx, i_s_innodb_locks, i_s_innodb_lock_waits, i_s_innodb_cmp, |