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

10.0-base merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-01-31 09:48:19 +01:00
parent 055b62f404 5267af5e9e
commit ab83952f29
531 changed files with 47557 additions and 6579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result
View File

@@ -55,9 +55,6 @@ Warnings:
Warning 1292 Truncated incorrect innodb_change_buffering_debug value: '-2'
set global innodb_change_buffering_debug=1e1;
ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering_debug'
set global innodb_change_buffering_debug=2;
Warnings:
Warning 1292 Truncated incorrect innodb_change_buffering_debug value: '2'
SET @@global.innodb_change_buffering_debug = @start_global_value;
SELECT @@global.innodb_change_buffering_debug;
@@global.innodb_change_buffering_debug

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

@@ -0,0 +1 @@
XtraDB extension

1
mysql-test/suite/sys_vars/r/innodb_locking_fake_changes_basic.result Normal file
View File

@@ -0,0 +1 @@
XtraDB extension

1
mysql-test/suite/sys_vars/r/innodb_max_bitmap_file_size_basic.result Normal file
View File

@@ -0,0 +1 @@
XtraDB extension

3
mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result
View File

@@ -1,8 +1,5 @@
select @@global.pseudo_thread_id;
ERROR HY000: Variable 'pseudo_thread_id' is a SESSION variable
select @@session.pseudo_thread_id between 1 and 10000;
@@session.pseudo_thread_id between 1 and 10000
1
should be empty
show global variables like 'pseudo_thread_id';
Variable_name Value

4
mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test
View File

@@ -42,7 +42,9 @@ set global innodb_change_buffering_debug='foo';
set global innodb_change_buffering_debug=-2;
--error ER_WRONG_TYPE_FOR_VAR
set global innodb_change_buffering_debug=1e1;
set global innodb_change_buffering_debug=2;
# The value 2 is supposed to kill the server if there are unmerged changes.
# Do not try to set the value to 2 or anything that can be clamped to 2.
#set global innodb_change_buffering_debug=2;
#
# Cleanup

1
mysql-test/suite/sys_vars/t/innodb_changed_pages_limit_basic.test
View File

@@ -0,0 +1 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test Normal file
View File

@@ -0,0 +1 @@
--echo XtraDB extension

1
mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test Normal file
View File

@@ -0,0 +1 @@
--echo XtraDB extension

3
mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test
View File

@@ -9,9 +9,6 @@
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@global.pseudo_thread_id;
# Check the variable has a valid numeric value (assumed to be less then 10000)
select @@session.pseudo_thread_id between 1 and 10000;
--echo should be empty
show global variables like 'pseudo_thread_id';