summaryrefslogtreecommitdiff
path: root/mysql-test/main/variables.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/variables.test')
-rw-r--r--mysql-test/main/variables.test23
1 files changed, 2 insertions, 21 deletions
diff --git a/mysql-test/main/variables.test b/mysql-test/main/variables.test
index 846d2665013..495ab101352 100644
--- a/mysql-test/main/variables.test
+++ b/mysql-test/main/variables.test
@@ -113,8 +113,6 @@ explain extended select last_insert_id(345);
select @@IDENTITY,last_insert_id(), @@identity;
explain extended select @@IDENTITY,last_insert_id(), @@identity;
-set big_tables=OFF, big_tables=ON, big_tables=0, big_tables=1, big_tables="OFF", big_tables="ON";
-
set global concurrent_insert=2;
show variables like 'concurrent_insert';
select * from information_schema.session_variables where variable_name like 'concurrent_insert';
@@ -127,13 +125,6 @@ select * from information_schema.session_variables where variable_name like 'con
set global concurrent_insert=DEFAULT;
select @@concurrent_insert;
-set global timed_mutexes=ON;
-show variables like 'timed_mutexes';
-select * from information_schema.session_variables where variable_name like 'timed_mutexes';
-set global timed_mutexes=0;
-show variables like 'timed_mutexes';
-select * from information_schema.session_variables where variable_name like 'timed_mutexes';
-
set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE";
show local variables like 'default_storage_engine';
select * from information_schema.session_variables where variable_name like 'default_storage_engine';
@@ -241,10 +232,6 @@ SELECT @@version_compile_os LIKE 'non-existent';
# The following should give errors
---error ER_WRONG_VALUE_FOR_VAR
-set big_tables=OFFF;
---error ER_WRONG_VALUE_FOR_VAR
-set big_tables="OFFF";
--error ER_UNKNOWN_SYSTEM_VARIABLE
set unknown_variable=1;
--error ER_WRONG_TYPE_FOR_VAR
@@ -252,7 +239,7 @@ set max_join_size="hello";
--error ER_UNKNOWN_STORAGE_ENGINE
set default_storage_engine=UNKNOWN_TABLE_TYPE;
--error ER_WRONG_VALUE_FOR_VAR
-set default_storage_engine=MERGE, big_tables=2;
+set default_storage_engine=MERGE, sql_warnings=NULL;
show local variables like 'default_storage_engine';
--error ER_UNKNOWN_CHARACTER_SET
set character_set_client=UNKNOWN_CHARACTER_SET;
@@ -276,8 +263,7 @@ set @@SQL_WARNINGS=NULL;
# Test setting all variables
set autocommit=1;
-set big_tables=1;
-select @@autocommit, @@big_tables;
+select @@autocommit;
set global binlog_cache_size=100;
set bulk_insert_buffer_size=100;
set character set cp1251_koi8;
@@ -1264,11 +1250,6 @@ SET @@global.max_join_size=DEFAULT;
SET @@global.key_buffer_size=@kbs;
SET @@global.key_cache_block_size=@kcbs;
-#
-# Bug#56976: added new start-up parameter
-#
-select @@max_long_data_size > 0;
-
--echo #
--echo # Bug#11766424 59527:
--echo # Assert in DECIMAL_BIN_SIZE: