database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge 5.5 -> 5.5-mwl248.

Browse Source
This commit is contained in:
Igor Babaev
2012-06-26 11:37:48 -07:00
parent 4ff6fd34da 072097174c
commit 4a6a08309c
299 changed files with 8349 additions and 2548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,4 +11,5 @@
##############################################################################
innodb_trx_rseg_n_slots_debug_basic: variable innodb_trx_rseg_n_slots_debug is removed in MariaDB
innodb_flush_checkpoint_debug_basic: removed from XtraDB-26.0

1
mysql-test/suite/sys_vars/r/all_vars.result
View File

@@ -10,5 +10,6 @@ there should be *no* long test name listed below:
select distinct variable_name as `there should be *no* variables listed below:` from t2
left join t1 on variable_name=test_name where test_name is null;
there should be *no* variables listed below:
expensive_subquery_limit
drop table t1;
drop table t2;

5
mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test
View File

@@ -1,11 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
if (`select plugin_auth_version <= "1.1.8-24.1" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not supported by XtraDB 1.1.8-24.1 or earlier
}
SET @start_global_value = @@global.innodb_trx_rseg_n_slots_debug;
SELECT @start_global_value;