diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-08-13 13:35:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-08-13 13:35:36 +0200 |
| commit | fcf87600a2d7ae03f7bda16c2f16cdec980d2a56 (patch) | |
| tree | 0dd158f601c1b38f1b5e80eab137cd406c4499cb | |
| parent | a6617eb341c9598f1247e8ddc5c66b7bec55129d (diff) | |
| download | mariadb-git-fcf87600a2d7ae03f7bda16c2f16cdec980d2a56.tar.gz | |
MDEV-4865 Change related to --log option/variable was merged partially
Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)
58 files changed, 74 insertions, 2127 deletions
diff --git a/mysql-test/include/common-tests.inc b/mysql-test/include/common-tests.inc index 4b61826c347..204b6d4dd6b 100644 --- a/mysql-test/include/common-tests.inc +++ b/mysql-test/include/common-tests.inc @@ -1412,9 +1412,9 @@ drop table tmp; # big table done -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; select distinct fld5 from t2 limit 10; @@ -1423,9 +1423,9 @@ select distinct fld5 from t2 limit 10; # select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET SQL_BIG_TABLES=1; # Force use of MyISAM +SET BIG_TABLES=1; # Force use of MyISAM select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; # diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2cfa9a7e066..2df1d7d4e34 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1967,10 +1967,6 @@ sub collect_mysqld_features_from_running_server () } } - # "Convert" innodb flag - $mysqld_variables{'innodb'}= "ON" - if ($mysqld_variables{'have_innodb'} eq "YES"); - # Parse version my $version_str= $mysqld_variables{'version'}; if ( $version_str =~ /^([0-9]*)\.([0-9]*)\.([0-9]*)([^\s]*)/ ) diff --git a/mysql-test/r/bootstrap.result b/mysql-test/r/bootstrap.result index 2e2082441f8..c4775a787f2 100644 --- a/mysql-test/r/bootstrap.result +++ b/mysql-test/r/bootstrap.result @@ -11,9 +11,6 @@ End of 5.1 tests # Bug #11766306: 59393: HAVE_INNODB=YES WHEN MYSQLD # STARTED WITH --SKIP-INNODB # -SHOW VARIABLES LIKE 'have_innodb'; -Variable_name Value -have_innodb DISABLED SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb' and SUPPORT='YES'; diff --git a/mysql-test/r/compress.result b/mysql-test/r/compress.result index ff99f1da32f..83b50351ba9 100644 --- a/mysql-test/r/compress.result +++ b/mysql-test/r/compress.result @@ -514,7 +514,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -527,7 +527,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -564,7 +564,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -577,7 +577,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/r/events_logs_tests.result b/mysql-test/r/events_logs_tests.result index b7faf56f466..9cc6e44511c 100644 --- a/mysql-test/r/events_logs_tests.result +++ b/mysql-test/r/events_logs_tests.result @@ -38,9 +38,9 @@ USER_HOST select 'events_logs_test' as inside_event Check slow query log Ensure that slow logging is on -show variables like 'log_slow_queries'; +show variables like 'slow_query_log'; Variable_name Value -log_slow_queries ON +slow_query_log ON Demonstrate that session value has no effect diff --git a/mysql-test/r/log_slow.result b/mysql-test/r/log_slow.result index 4414a32d821..ca8b9e7c439 100644 --- a/mysql-test/r/log_slow.result +++ b/mysql-test/r/log_slow.result @@ -10,7 +10,6 @@ select @@log_slow_verbosity; show variables like "log_slow%"; Variable_name Value log_slow_filter admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk -log_slow_queries ON log_slow_rate_limit 1 log_slow_verbosity set @org_slow_query_log= @@global.slow_query_log; diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index 1ce7eb0d2aa..cc6f3709ae4 100644 --- a/mysql-test/r/log_state.result +++ b/mysql-test/r/log_state.result @@ -6,12 +6,9 @@ set global general_log= OFF; truncate table mysql.general_log; truncate table mysql.slow_log; show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; Variable_name Value general_log OFF -log OFF -log_slow_queries OFF slow_query_log OFF flush logs; set global general_log= ON; @@ -30,12 +27,9 @@ TIMESTAMP USER_HOST # 1 Query set global general_log= OFF set global general_log= ON; flush logs; show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; Variable_name Value general_log ON -log ON -log_slow_queries OFF slow_query_log OFF # Establish connection con1 (user=root) # Switch to connection con1 @@ -58,12 +52,9 @@ start_time user_host query_time lock_time rows_sent rows_examined db last_insert TIMESTAMP USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 select sleep(@long_query_time + 1) THREAD_ID # Switch to connection default show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; Variable_name Value general_log ON -log ON -log_slow_queries ON slow_query_log ON set global general_log= ON; set global general_log= OFF; @@ -86,12 +77,9 @@ select * from mysql.general_log; event_time user_host thread_id server_id command_type argument set global general_log= ON; show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; Variable_name Value general_log ON -log ON -log_slow_queries OFF slow_query_log OFF show variables like 'general_log_file'; Variable_name Value @@ -187,71 +175,6 @@ SET GLOBAL slow_query_log = ON; SET GLOBAL READ_ONLY = OFF; SET GLOBAL general_log = @old_general_log; SET GLOBAL slow_query_log = @old_slow_query_log; -SET GLOBAL general_log = ON; -SHOW VARIABLES LIKE 'general_log'; -Variable_name Value -general_log ON -SHOW VARIABLES LIKE 'log'; -Variable_name Value -log ON -SELECT @@general_log, @@log; -@@general_log @@log -1 1 -SET GLOBAL log = 0; -Warnings: -Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead -SHOW VARIABLES LIKE 'general_log'; -Variable_name Value -general_log OFF -SHOW VARIABLES LIKE 'log'; -Variable_name Value -log OFF -SELECT @@general_log, @@log; -@@general_log @@log -0 0 -SET GLOBAL general_log = 1; -SHOW VARIABLES LIKE 'general_log'; -Variable_name Value -general_log ON -SHOW VARIABLES LIKE 'log'; -Variable_name Value -log ON -SELECT @@general_log, @@log; -@@general_log @@log -1 1 -SHOW VARIABLES LIKE 'slow_query_log'; -Variable_name Value -slow_query_log OFF -SHOW VARIABLES LIKE 'log_slow_queries'; -Variable_name Value -log_slow_queries OFF -SELECT @@slow_query_log, @@log_slow_queries; -@@slow_query_log @@log_slow_queries -0 0 -SET GLOBAL log_slow_queries = 0; -Warnings: -Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead -SHOW VARIABLES LIKE 'slow_query_log'; -Variable_name Value -slow_query_log OFF -SHOW VARIABLES LIKE 'log_slow_queries'; -Variable_name Value -log_slow_queries OFF -SELECT @@slow_query_log, @@log_slow_queries; -@@slow_query_log @@log_slow_queries -0 0 -SET GLOBAL slow_query_log = 1; -SHOW VARIABLES LIKE 'slow_query_log'; -Variable_name Value -slow_query_log ON -SHOW VARIABLES LIKE 'log_slow_queries'; -Variable_name Value -log_slow_queries ON -SELECT @@slow_query_log, @@log_slow_queries; -@@slow_query_log @@log_slow_queries -1 1 -SET GLOBAL general_log = @old_general_log; -SET GLOBAL slow_query_log = @old_slow_query_log; SET GLOBAL general_log_file= CONCAT('/not existing path/log.maste', 'r'); ERROR 42000: Variable 'general_log_file' can't be set to the value of '/not existing path/log.master' SET GLOBAL general_log_file= NULL; @@ -280,34 +203,6 @@ SET GLOBAL general_log_file = @old_general_log_file; SET GLOBAL slow_query_log_file = @old_slow_query_log_file; # -- End of Bug#32748. -deprecated: -SET GLOBAL log = 0; -Warnings: -Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead -SET GLOBAL log_slow_queries = 0; -Warnings: -Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead -SET GLOBAL log = DEFAULT; -Warnings: -Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead -SET GLOBAL log_slow_queries = DEFAULT; -Warnings: -Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead -not deprecated: -SELECT @@global.general_log_file INTO @my_glf; -SELECT @@global.slow_query_log_file INTO @my_sqlf; -SET GLOBAL general_log = 0; -SET GLOBAL slow_query_log = 0; -SET GLOBAL general_log_file = 'WL4403_G.log'; -SET GLOBAL slow_query_log_file = 'WL4403_SQ.log'; -SET GLOBAL general_log_file = @my_glf; -SET GLOBAL slow_query_log_file = @my_sqlf; -SET GLOBAL general_log = DEFAULT; -SET GLOBAL slow_query_log = DEFAULT; -SET @@global.general_log = @old_general_log; -SET @@global.general_log_file = @old_general_log_file; -SET @@global.slow_query_log = @old_slow_query_log; -SET @@global.slow_query_log_file = @old_slow_query_log_file; # # Bug #49756 Rows_examined is always 0 in the slow query log # for update statements diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 610157502b9..f221f61be02 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -149,10 +149,6 @@ The following options may be given as the first argument: --div-precision-increment=# Precision of the result of '/' operator will be increased on that value - --engine-condition-pushdown - Push supported query conditions to the storage engine. - Deprecated, use --optimizer-switch instead. - (Defaults to on; use --skip-engine-condition-pushdown to disable.) --event-scheduler[=name] Enable the event scheduler. Possible values are ON, OFF, and DISABLED (keep the event scheduler completely @@ -324,14 +320,6 @@ The following options may be given as the first argument: slave, filesort, filesort_on_disk, full_join, full_scan, query_cache, query_cache_miss, tmp_table, tmp_table_on_disk - --log-slow-queries[=name] - Enable logging of slow queries (longer than - --long-query-time) to log file or table. Optional - argument is a file name for the slow log. If not given, - 'log-basename'-slow.log will be used. Use - --log-output=TABLE if you want to have the log in the - table mysql.slow_log. Deprecated option, use - --slow-query-log/--slow-query-log-file instead. --log-slow-rate-limit=# Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or @@ -477,8 +465,6 @@ The following options may be given as the first argument: Enable old-style user limits (before 5.0.3, user resources were counted per each user+host vs. per account). - --one-thread (Deprecated): Only use one thread (for debugging under - Linux). Use thread-handling=no-threads instead. --open-files-limit=# If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this @@ -857,10 +843,6 @@ The following options may be given as the first argument: --skip-show-database Don't allow 'SHOW DATABASE' commands --skip-slave-start If set, slave is not autostarted. - --skip-thread-priority - Don't give threads different priorities. This option is - deprecated because it has no effect; the implied behavior - is already the default. --slave-compressed-protocol Use compression on master/slave protocol --slave-exec-mode=name @@ -1050,7 +1032,6 @@ delayed-insert-limit 100 delayed-insert-timeout 300 delayed-queue-size 1000 div-precision-increment 4 -engine-condition-pushdown FALSE event-scheduler OFF expensive-subquery-limit 100 expire-logs-days 0 diff --git a/mysql-test/r/pool_of_threads.result b/mysql-test/r/pool_of_threads.result index c151805e151..9611d7ff43b 100644 --- a/mysql-test/r/pool_of_threads.result +++ b/mysql-test/r/pool_of_threads.result @@ -510,7 +510,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -523,7 +523,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -560,7 +560,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -573,7 +573,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index d639580acf9..a6c12dfba52 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -513,7 +513,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -526,7 +526,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -563,7 +563,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -576,7 +576,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result index 18b050b53e7..e9c88771752 100644 --- a/mysql-test/r/select_jcl6.result +++ b/mysql-test/r/select_jcl6.result @@ -524,7 +524,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -537,7 +537,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -574,7 +574,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -587,7 +587,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result index d639580acf9..a6c12dfba52 100644 --- a/mysql-test/r/select_pkeycache.result +++ b/mysql-test/r/select_pkeycache.result @@ -513,7 +513,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -526,7 +526,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -563,7 +563,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -576,7 +576,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result index 14c37c1575d..88d81196dcf 100644 --- a/mysql-test/r/ssl.result +++ b/mysql-test/r/ssl.result @@ -517,7 +517,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -530,7 +530,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -567,7 +567,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -580,7 +580,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/r/ssl_compress.result b/mysql-test/r/ssl_compress.result index e7ae7885059..31f484ab58c 100644 --- a/mysql-test/r/ssl_compress.result +++ b/mysql-test/r/ssl_compress.result @@ -514,7 +514,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -527,7 +527,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -564,7 +564,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -577,7 +577,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result index df7733a1cd3..85abcb0139d 100644 --- a/mysql-test/r/subselect4.result +++ b/mysql-test/r/subselect4.result @@ -425,20 +425,13 @@ PRIMARY KEY (`pk`), KEY `varchar_key` (`varchar_key`) ) AUTO_INCREMENT=12 DEFAULT CHARSET=latin1; INSERT INTO `t1` VALUES (10,'00:00:00','i','i'),(11,'00:00:00','',''); -set @old_optimizer_switch = @@session.optimizer_switch, -@old_engine_condition_pushdown = @@session.engine_condition_pushdown; -SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on'; -SET SESSION engine_condition_pushdown = 1; -Warnings: -Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead +set @old_optimizer_switch = @@session.optimizer_switch; +SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on,engine_condition_pushdown=on'; SELECT `time_nokey` G1 FROM t1 WHERE ( `varchar_nokey` , `varchar_key` ) IN ( SELECT `varchar_nokey` , `varchar_nokey` ) AND `varchar_key` >= 'c' HAVING G1 ORDER BY `pk` ; G1 -set @@session.optimizer_switch = @old_optimizer_switch, -@@session.engine_condition_pushdown = @old_engine_condition_pushdown; -Warnings: -Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead +set @@session.optimizer_switch = @old_optimizer_switch; DROP TABLE t1; # # During work with BUG#45863 I had problems with a query that was @@ -620,12 +613,8 @@ PRIMARY KEY (pk) ); INSERT INTO t2 VALUES (9,1); # Enable Index condition pushdown -SELECT @old_icp:=@@engine_condition_pushdown; -@old_icp:=@@engine_condition_pushdown -# -SET SESSION engine_condition_pushdown = 'ON'; -Warnings: -Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead +set @old_icp=@@optimizer_switch; +SET SESSION optimizer_switch="engine_condition_pushdown=on"; SELECT pk FROM t2 @@ -638,9 +627,7 @@ ORDER BY t1.i2 desc); pk 9 # Restore old value for Index condition pushdown -SET SESSION engine_condition_pushdown=@old_icp; -Warnings: -Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead +SET SESSION optimizer_switch=@old_icp; DROP TABLE t1,t2; # # End of 5.3 tests. diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 417ac0158ce..f206ec37146 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -561,11 +561,9 @@ select @@sql_auto_is_null; @@sql_auto_is_null 0 set sql_big_selects=1; -set sql_big_tables=1; set sql_buffer_result=1; set sql_log_bin=1; set sql_log_off=1; -set sql_low_priority_updates=1; set sql_quote_show_create=1; set sql_safe_updates=1; set sql_select_limit=1; @@ -761,9 +759,6 @@ select ifnull(@@character_set_results,"really null"); ifnull(@@character_set_results,"really null") really null set names latin1; -select @@have_innodb; -@@have_innodb -# *** Various tests with LC_TIME_NAMES *** LC_TIME_NAMES: testing case insensitivity set @@lc_time_names='ru_ru'; diff --git a/mysql-test/suite/multi_source/syntax.result b/mysql-test/suite/multi_source/syntax.result index 9d84250a5f8..c00617ac9e2 100644 --- a/mysql-test/suite/multi_source/syntax.result +++ b/mysql-test/suite/multi_source/syntax.result @@ -21,10 +21,6 @@ start slave 'qqq'; ERROR HY000: There is no master connection 'qqq' stop slave 'qqq'; ERROR HY000: There is no master connection 'qqq' -slave 'qqq' start; -ERROR HY000: There is no master connection 'qqq' -slave 'qqq' stop; -ERROR HY000: There is no master connection 'qqq' flush slave 'qqq'; ERROR HY000: There is no master connection 'qqq' reset slave 'qqq'; diff --git a/mysql-test/suite/multi_source/syntax.test b/mysql-test/suite/multi_source/syntax.test index ae493200bf1..12539d32a64 100644 --- a/mysql-test/suite/multi_source/syntax.test +++ b/mysql-test/suite/multi_source/syntax.test @@ -27,10 +27,6 @@ start slave 'qqq'; --error WARN_NO_MASTER_INFO stop slave 'qqq'; --error WARN_NO_MASTER_INFO -slave 'qqq' start; ---error WARN_NO_MASTER_INFO -slave 'qqq' stop; ---error WARN_NO_MASTER_INFO flush slave 'qqq'; --error WARN_NO_MASTER_INFO reset slave 'qqq'; diff --git a/mysql-test/suite/perfschema/r/short_option_1.result b/mysql-test/suite/perfschema/r/short_option_1.result index d97ece1f67a..45f7d989d8e 100644 --- a/mysql-test/suite/perfschema/r/short_option_1.result +++ b/mysql-test/suite/perfschema/r/short_option_1.result @@ -13,9 +13,6 @@ utf8 show variables like 'character_set_system'; Variable_name Value character_set_system utf8 -show variables like 'log'; -Variable_name Value -log ON show variables like 'general_log'; Variable_name Value general_log ON diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test index b94d1685867..ff62a392cfa 100644 --- a/mysql-test/suite/perfschema/t/short_option_1.test +++ b/mysql-test/suite/perfschema/t/short_option_1.test @@ -11,7 +11,6 @@ show variables like 'sql_mode'; select @@character_set_server; show variables like 'character_set_system'; -show variables like 'log'; show variables like 'general_log'; show variables like 'new'; diff --git a/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt b/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt index efd795e94fe..439117269a8 100644 --- a/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt @@ -1 +1 @@ ---log-slow-slave-statements --log-slow-queries +--log-slow-slave-statements --slow-query-log diff --git a/mysql-test/suite/sys_vars/r/optimizer_switch_eng_cond_pushdown1.result b/mysql-test/suite/sys_vars/r/optimizer_switch_eng_cond_pushdown1.result deleted file mode 100644 index be4da117c2b..00000000000 --- a/mysql-test/suite/sys_vars/r/optimizer_switch_eng_cond_pushdown1.result +++ /dev/null @@ -1,5 +0,0 @@ -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch -1 1 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=off,exists_to_in=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=off,exists_to_in=off diff --git a/mysql-test/suite/sys_vars/r/optimizer_switch_eng_cond_pushdown2.result b/mysql-test/suite/sys_vars/r/optimizer_switch_eng_cond_pushdown2.result deleted file mode 100644 index d1c5516d9ed..00000000000 --- a/mysql-test/suite/sys_vars/r/optimizer_switch_eng_cond_pushdown2.result +++ /dev/null @@ -1,5 +0,0 @@ -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch -0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=off,exists_to_in=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=off,exists_to_in=off diff --git a/mysql-test/suite/sys_vars/r/sql_big_selects_func.result b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result index f96e28379a3..bd534140172 100644 --- a/mysql-test/suite/sys_vars/r/sql_big_selects_func.result +++ b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result @@ -3,9 +3,7 @@ SET @session_sql_big_selects = @@SESSION.sql_big_selects; SET @session_max_join_size = @@SESSION.max_join_size; SET @global_max_join_size = @@GLOBAL.max_join_size; -SET SQL_MAX_JOIN_SIZE=9; -Warnings: -Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use '@@max_join_size' instead +SET MAX_JOIN_SIZE=9; CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20)); CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20)); INSERT INTO t1 VALUES('aa','bb'); diff --git a/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test b/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test deleted file mode 100644 index ab9bfc3dd6a..00000000000 --- a/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test +++ /dev/null @@ -1,267 +0,0 @@ -############## mysql-test\t\engine_condition_pushdown_basic.test ############## -# # -# Variable Name: engine_condition_pushdown # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: boolean # -# Default Value: OFF # -# Valid Values: ON, OFF # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -# Description: Test Cases of Dynamic System Variable engine_condition_pushdown# -# that checks the behavior of this variable in the following ways# -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/load_sysvars.inc - -######################################################################## -# START OF engine_condition_pushdown TESTS # -######################################################################## - - -############################################################################### -# Saving initial value of engine_condition_pushdown in a temporary variable # -############################################################################### - -SET @session_start_value = @@session.engine_condition_pushdown; -SELECT @session_start_value; - -SET @global_start_value = @@global.engine_condition_pushdown; -SELECT @global_start_value; - -# same for optimizer_switch -select @old_session_opt_switch:=@@session.optimizer_switch, -@old_global_opt_switch:=@@global.optimizer_switch; - ---echo '#--------------------FN_DYNVARS_028_01------------------------#' -######################################################################## -# Display the DEFAULT value of engine_condition_pushdown # -######################################################################## - -SET @@session.engine_condition_pushdown = 0; -SET @@session.engine_condition_pushdown = DEFAULT; -SELECT @@session.engine_condition_pushdown; - -SET @@global.engine_condition_pushdown = 0; -SET @@global.engine_condition_pushdown = DEFAULT; -SELECT @@global.engine_condition_pushdown; - ---echo '#---------------------FN_DYNVARS_028_02-------------------------#' -############################################################################### -# Check if engine_condition_pushdown can be accessed with and without @@ sign # -############################################################################### - -SET engine_condition_pushdown = 1; -SELECT @@engine_condition_pushdown; - ---Error ER_UNKNOWN_TABLE -SELECT session.engine_condition_pushdown; - ---Error ER_UNKNOWN_TABLE -SELECT local.engine_condition_pushdown; - ---Error ER_UNKNOWN_TABLE -SELECT global.engine_condition_pushdown; - -SET session engine_condition_pushdown = 0; -SELECT @@session.engine_condition_pushdown; - -SET global engine_condition_pushdown = 0; -SELECT @@global.engine_condition_pushdown; - - ---echo '#--------------------FN_DYNVARS_028_03------------------------#' -########################################################################## -# change the value of engine_condition_pushdown to a valid value # -########################################################################## - -SET @@session.engine_condition_pushdown = 0; -SELECT @@session.engine_condition_pushdown; -SET @@session.engine_condition_pushdown = 1; -SELECT @@session.engine_condition_pushdown; - - -SET @@global.engine_condition_pushdown = 0; -SELECT @@global.engine_condition_pushdown; -SET @@global.engine_condition_pushdown = 1; -SELECT @@global.engine_condition_pushdown; - - ---echo '#--------------------FN_DYNVARS_028_04-------------------------#' -########################################################################### -# Change the value of engine_condition_pushdown to invalid value # -########################################################################### - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.engine_condition_pushdown = -1; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.engine_condition_pushdown = 1.6; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.engine_condition_pushdown = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.engine_condition_pushdown = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.engine_condition_pushdown = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.engine_condition_pushdown = ÕN; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.engine_condition_pushdown = OF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.engine_condition_pushdown = ÓFF; - - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = -1; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = 2; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = ÕN; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = OF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.engine_condition_pushdown = ÓFF; - - ---echo '#-------------------FN_DYNVARS_028_05----------------------------#' -########################################################################### -# Test if changing global variable effects session and vice versa # -########################################################################### - -SET @@global.engine_condition_pushdown = 0; -SET @@session.engine_condition_pushdown = 1; -SELECT @@global.engine_condition_pushdown AS res_is_0; - -SET @@global.engine_condition_pushdown = 0; -SELECT @@session.engine_condition_pushdown AS res_is_1; - ---echo '#----------------------FN_DYNVARS_028_06------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - -SELECT IF(@@global.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='engine_condition_pushdown'; -SELECT @@global.engine_condition_pushdown; -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='engine_condition_pushdown'; - ---echo '#----------------------FN_DYNVARS_028_07------------------------#' -######################################################################### -# Check if the value in SESSION Table matches value in variable # -######################################################################### - -SELECT IF(@@session.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='engine_condition_pushdown'; -SELECT @@session.engine_condition_pushdown; -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='engine_condition_pushdown'; - - ---echo '#---------------------FN_DYNVARS_028_08-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - -SET @@session.engine_condition_pushdown = OFF; -SELECT @@session.engine_condition_pushdown; -SET @@session.engine_condition_pushdown = ON; -SELECT @@session.engine_condition_pushdown; - -SET @@global.engine_condition_pushdown = OFF; -SELECT @@global.engine_condition_pushdown; -SET @@global.engine_condition_pushdown = ON; -SELECT @@global.engine_condition_pushdown; - ---echo '#---------------------FN_DYNVARS_028_09----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@session.engine_condition_pushdown = TRUE; -SELECT @@session.engine_condition_pushdown; -SET @@session.engine_condition_pushdown = FALSE; -SELECT @@session.engine_condition_pushdown; - -SET @@global.engine_condition_pushdown = TRUE; -SELECT @@global.engine_condition_pushdown; -SET @@global.engine_condition_pushdown = FALSE; -SELECT @@global.engine_condition_pushdown; - ---echo Check that @@engine_condition_pushdown influences ---echo @@optimizer_switch and vice-versa -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@session.engine_condition_pushdown = TRUE; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@session.engine_condition_pushdown = FALSE; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@global.engine_condition_pushdown = TRUE; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@global.engine_condition_pushdown = FALSE; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@session.optimizer_switch = "engine_condition_pushdown=on"; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@session.optimizer_switch = "engine_condition_pushdown=off"; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@global.optimizer_switch = "engine_condition_pushdown=on"; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; -set @@global.optimizer_switch = "engine_condition_pushdown=off"; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; - -############################## -# Restore initial value # -############################## - -SET @@session.engine_condition_pushdown = @session_start_value; -SELECT @@session.engine_condition_pushdown; - -SET @@global.engine_condition_pushdown = @global_start_value; -SELECT @@global.engine_condition_pushdown; - -set @session.optimizer_switch=@old_session_opt_switch, -@@global.optimizer_switch=@old_global_opt_switch; -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; - -############################################################### -# END OF engine_condition_pushdown TESTS # -############################################################### diff --git a/mysql-test/suite/sys_vars/t/have_csv_basic.test b/mysql-test/suite/sys_vars/t/have_csv_basic.test deleted file mode 100644 index 12081ff270e..00000000000 --- a/mysql-test/suite/sys_vars/t/have_csv_basic.test +++ /dev/null @@ -1,100 +0,0 @@ - - -################## mysql-test\t\have_csv_basic.test ########################### -# # -# Variable Name: have_csv # -# Scope: Global # -# Access Type: Static # -# Data Type: boolean # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable have_csv # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---echo '#---------------------BS_STVARS_008_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.have_csv); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_008_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.have_csv=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.have_csv); ---echo 1 Expected - - - - ---echo '#---------------------BS_STVARS_008_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - -SELECT @@GLOBAL.have_csv = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_csv'; ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.have_csv); ---echo 1 Expected - -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_csv'; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_008_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@have_csv = @@GLOBAL.have_csv; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_008_05----------------------#' -################################################################################ -# Check if have_csv can be accessed with and without @@ sign # -################################################################################ - -SELECT COUNT(@@have_csv); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.have_csv); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.have_csv); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.have_csv); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT have_csv = @@SESSION.have_csv; ---echo Expected error 'Readonly variable' - - diff --git a/mysql-test/suite/sys_vars/t/have_innodb_basic.test b/mysql-test/suite/sys_vars/t/have_innodb_basic.test deleted file mode 100644 index 9ae1bb0d443..00000000000 --- a/mysql-test/suite/sys_vars/t/have_innodb_basic.test +++ /dev/null @@ -1,100 +0,0 @@ - - -################## mysql-test\t\have_innodb_basic.test ######################## -# # -# Variable Name: have_innodb # -# Scope: Global # -# Access Type: Static # -# Data Type: boolean # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable have_innodb # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---echo '#---------------------BS_STVARS_011_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.have_innodb); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_011_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.have_innodb=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.have_innodb); ---echo 1 Expected - - - - ---echo '#---------------------BS_STVARS_011_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - -SELECT @@GLOBAL.have_innodb = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_innodb'; ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.have_innodb); ---echo 1 Expected - -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_innodb'; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_011_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@have_innodb = @@GLOBAL.have_innodb; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_011_05----------------------#' -################################################################################ -# Check if have_innodb can be accessed with and without @@ sign # -################################################################################ - -SELECT COUNT(@@have_innodb); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.have_innodb); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.have_innodb); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.have_innodb); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT have_innodb = @@SESSION.have_innodb; ---echo Expected error 'Readonly variable' - - diff --git a/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test b/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test deleted file mode 100644 index 1ac341ff62e..00000000000 --- a/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test +++ /dev/null @@ -1,100 +0,0 @@ - - -################## mysql-test\t\have_ndbcluster_basic.test #################### -# # -# Variable Name: have_ndbcluster # -# Scope: Global # -# Access Type: Static # -# Data Type: boolean # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable have_ndbcluster # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---echo '#---------------------BS_STVARS_012_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.have_ndbcluster); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_012_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.have_ndbcluster=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.have_ndbcluster); ---echo 1 Expected - - - - ---echo '#---------------------BS_STVARS_012_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - -SELECT @@GLOBAL.have_ndbcluster = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_ndbcluster'; ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.have_ndbcluster); ---echo 1 Expected - -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_ndbcluster'; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_012_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@have_ndbcluster = @@GLOBAL.have_ndbcluster; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_012_05----------------------#' -################################################################################ -# Check if have_ndbcluster can be accessed with and without @@ sign # -################################################################################ - -SELECT COUNT(@@have_ndbcluster); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.have_ndbcluster); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.have_ndbcluster); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.have_ndbcluster); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT have_ndbcluster = @@SESSION.have_ndbcluster; ---echo Expected error 'Readonly variable' - - diff --git a/mysql-test/suite/sys_vars/t/have_partitioning_basic.test b/mysql-test/suite/sys_vars/t/have_partitioning_basic.test deleted file mode 100644 index b37abdb1498..00000000000 --- a/mysql-test/suite/sys_vars/t/have_partitioning_basic.test +++ /dev/null @@ -1,100 +0,0 @@ - - -################## mysql-test\t\have_partitioning_basic.test ################## -# # -# Variable Name: have_partitioning # -# Scope: Global # -# Access Type: Static # -# Data Type: boolean # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable have_partitioning # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---echo '#---------------------BS_STVARS_014_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.have_partitioning); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_014_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.have_partitioning=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.have_partitioning); ---echo 1 Expected - - - - ---echo '#---------------------BS_STVARS_014_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - -SELECT @@GLOBAL.have_partitioning = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_partitioning'; ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.have_partitioning); ---echo 1 Expected - -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='have_partitioning'; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_014_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@have_partitioning = @@GLOBAL.have_partitioning; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_014_05----------------------#' -################################################################################ -# Check if have_partitioning can be accessed with and without @@ sign # -################################################################################ - -SELECT COUNT(@@have_partitioning); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.have_partitioning); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.have_partitioning); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.have_partitioning); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT have_partitioning = @@SESSION.have_partitioning; ---echo Expected error 'Readonly variable' - - diff --git a/mysql-test/suite/sys_vars/t/log_basic.test b/mysql-test/suite/sys_vars/t/log_basic.test deleted file mode 100644 index 74b344cff6d..00000000000 --- a/mysql-test/suite/sys_vars/t/log_basic.test +++ /dev/null @@ -1,62 +0,0 @@ -###################### mysql-test\t\log_basic.test ############################ -# # -# Variable Name: log_basic # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: string # -# Default Value: # -# Range: # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -# Description: # -# Test Cases of Dynamic System Variable log that checks the behavior of # -# this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: # -# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # -# # -############################################################################### - ---source include/load_sysvars.inc - -##################################### -## START OF log TESTS ## -##################################### - ---echo '#--------------------FN_DYNVARS_062_01------------------#' -############################################################# -# Accessing variable # -############################################################# - -SET @start_log= @@global.log; - -SELECT @@global.log AS INIT_VALUE; - -SELECT @@log AS INIT_VALUE; - -SET @@global.log = ON; - -SET global log = 0; - ---echo '#--------------------FN_DYNVARS_062_02-------------------------#' -################################################################################ -# Check if the value in GLOBAL Table matches value in variable # -################################################################################ -# We can only access log value from information schema global_variables table -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log'; - -SET @@global.log= @start_log; - -############################################ -# END OF log TESTS # -############################################ - diff --git a/mysql-test/suite/sys_vars/t/log_slow_queries_basic.test b/mysql-test/suite/sys_vars/t/log_slow_queries_basic.test deleted file mode 100644 index 22fe4dfaa6e..00000000000 --- a/mysql-test/suite/sys_vars/t/log_slow_queries_basic.test +++ /dev/null @@ -1,186 +0,0 @@ -##################### mysql-test\t\slow_query_log_basic.test ################### -# # -# Variable Name: log_slow_queries # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: BOOLEAN # -# Default Value: OFF # -# Valid Values: ON, OFF # -# # -# # -# Creation Date: 2008-03-16 # -# Author: Salman Rawala # -# # -# Description: Test Cases of Dynamic System Variable "log_slow_queries" # -# that checks behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-options.html#option_mysqld_event-scheduler # -# # -# # -# 2010-01-20 OBN - Added check for variable value matching I_S tables after # -# variable value change # -# # -################################################################################ - ---source include/load_sysvars.inc - -########################################################### -# START OF log_slow_queries TESTS # -########################################################### - - -###################################################################### -# Saving initial value of log_slow_queries in a temporary variable # -###################################################################### - -SET @start_value = @@global.log_slow_queries; -SELECT @start_value; - - ---echo '#---------------------FN_DYNVARS_004_01-------------------------#' -############################################### -# Verify default value of variable # -############################################### - -SET @@global.log_slow_queries = DEFAULT; -SELECT @@global.log_slow_queries = 0; - - ---echo '#--------------------FN_DYNVARS_004_02------------------------#' -###################################################################### -# Change the value of log_slow_queries to a valid value # -###################################################################### - -SET @@global.log_slow_queries = ON; -SELECT @@global.log_slow_queries; -SET @@global.log_slow_queries = OFF; -SELECT @@global.log_slow_queries; - ---echo '#--------------------FN_DYNVARS_004_03-------------------------#' -###################################################################### -# Change the value of log_slow_queries to invalid value # -###################################################################### - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = 2; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = -1; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = TRUEF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = TRUE_F; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = FALSE0; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = OON; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = ONN; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = OOFF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = 0FF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = ' '; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = " "; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.log_slow_queries = ''; - - ---echo '#-------------------FN_DYNVARS_004_04----------------------------#' -################################################################## -# Test if accessing session log_slow_queries gives error # -################################################################## - ---Error ER_GLOBAL_VARIABLE -SET @@session.log_slow_queries = OFF; ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.log_slow_queries; - - ---echo '#----------------------FN_DYNVARS_004_05------------------------#' -############################################################################## -# Check if the value in GLOBAL Tables matches values in variable # -############################################################################## - -SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log_slow_queries'; - - ---echo '#---------------------FN_DYNVARS_004_06----------------------#' -################################################################ -# Check if 0 and 1 values can be used on variable # -################################################################ - -SET @@global.log_slow_queries = 0; -SELECT @@global.log_slow_queries; -SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log_slow_queries'; -SET @@global.log_slow_queries = 1; -SELECT @@global.log_slow_queries; -SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log_slow_queries'; - ---echo '#---------------------FN_DYNVARS_004_07----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@global.log_slow_queries = TRUE; -SELECT @@global.log_slow_queries; -SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log_slow_queries'; -SET @@global.log_slow_queries = FALSE; -SELECT @@global.log_slow_queries; -SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log_slow_queries'; - ---echo '#---------------------FN_DYNVARS_004_08----------------------#' -############################################################################## -# Check if accessing variable with SESSION,LOCAL and without SCOPE points # -# to same session variable # -############################################################################## - -SET @@global.log_slow_queries = ON; -SELECT @@log_slow_queries = @@global.log_slow_queries; - ---echo '#---------------------FN_DYNVARS_004_09----------------------#' -###################################################################### -# Check if log_slow_queries can be accessed with and without @@ sign # -###################################################################### ---Error ER_GLOBAL_VARIABLE -SET log_slow_queries = ON; ---Error ER_PARSE_ERROR -SET local.log_slow_queries = OFF; ---Error ER_UNKNOWN_TABLE -SELECT local.log_slow_queries; ---Error ER_PARSE_ERROR -SET global.log_slow_queries = ON; ---Error ER_UNKNOWN_TABLE -SELECT global.log_slow_queries; ---Error ER_BAD_FIELD_ERROR -SELECT log_slow_queries = @@session.log_slow_queries; - - - -############################## -# Restore initial value # -############################## - -SET @@global.log_slow_queries = @start_value; -SELECT @@global.log_slow_queries; - - -#################################################### -# END OF log_slow_queries TESTS # -#################################################### diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown1-master.opt b/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown1-master.opt deleted file mode 100644 index 89aa07976ac..00000000000 --- a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown1-master.opt +++ /dev/null @@ -1 +0,0 @@ ---optimizer-switch=engine_condition_pushdown=off --engine-condition-pushdown=1 diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown1.test b/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown1.test deleted file mode 100644 index 187aa145408..00000000000 --- a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown1.test +++ /dev/null @@ -1,5 +0,0 @@ -# check how --engine-condition-pushdown and --optimizer-switch -# influence each other when used together (last wins). -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown2-master.opt b/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown2-master.opt deleted file mode 100644 index f48ab5b963b..00000000000 --- a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown2-master.opt +++ /dev/null @@ -1 +0,0 @@ ---engine-condition-pushdown=1 --optimizer-switch=engine_condition_pushdown=off diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown2.test b/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown2.test deleted file mode 100644 index 187aa145408..00000000000 --- a/mysql-test/suite/sys_vars/t/optimizer_switch_eng_cond_pushdown2.test +++ /dev/null @@ -1,5 +0,0 @@ -# check how --engine-condition-pushdown and --optimizer-switch -# influence each other when used together (last wins). -select @@session.engine_condition_pushdown, -@@global.engine_condition_pushdown, -@@session.optimizer_switch, @@global.optimizer_switch; diff --git a/mysql-test/suite/sys_vars/t/sql_big_selects_func.test b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test index 4aefda5e15e..6cff8cfe553 100644 --- a/mysql-test/suite/sys_vars/t/sql_big_selects_func.test +++ b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test @@ -28,7 +28,7 @@ SET @session_sql_big_selects = @@SESSION.sql_big_selects; SET @session_max_join_size = @@SESSION.max_join_size; SET @global_max_join_size = @@GLOBAL.max_join_size; -SET SQL_MAX_JOIN_SIZE=9; +SET MAX_JOIN_SIZE=9; # # Create tables diff --git a/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test b/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test deleted file mode 100644 index 373ae06c850..00000000000 --- a/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test +++ /dev/null @@ -1,170 +0,0 @@ -###################### mysql-test\t\sql_big_tables_basic.test ################# -# # -# Variable Name: sql_big_tables # -# Scope: SESSION # -# Access Type: Dynamic # -# Data Type: boolean # -# Default Value: # -# Valid Values : 0,1 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -# Description: Test Cases of Dynamic System Variable sql_big_tables # -# that checks the behavior of this variable in the following ways# -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/load_sysvars.inc -######################################################################## -# START OF sql_big_tables TESTS # -######################################################################## - - -############################################################################## -# Saving initial value of sql_big_tables in a temporary variable # -############################################################################## - -SET @session_start_value = @@session.sql_big_tables; -SELECT @session_start_value; - ---echo '#--------------------FN_DYNVARS_154_01------------------------#' -######################################################################## -# Display the DEFAULT value of sql_big_tables # -######################################################################## - -SET @@session.sql_big_tables = 0; -SET @@session.sql_big_tables = DEFAULT; -SELECT @@session.sql_big_tables; - -SET @@session.sql_big_tables = 1; -SET @@session.sql_big_tables = DEFAULT; -SELECT @@session.sql_big_tables; - - ---echo '#---------------------FN_DYNVARS_154_02-------------------------#' -############################################################################# -# Check if sql_big_tables can be accessed with and without @@ sign # -############################################################################# - -SET sql_big_tables = 1; -SELECT @@sql_big_tables; - ---Error ER_UNKNOWN_TABLE -SELECT session.sql_big_tables; - ---Error ER_UNKNOWN_TABLE -SELECT local.sql_big_tables; - -SET session sql_big_tables = 0; -SELECT @@session.sql_big_tables; - - ---echo '#--------------------FN_DYNVARS_154_03------------------------#' -######################################################################## -# change the value of sql_big_tables to a valid value # -######################################################################## - -SET @@session.sql_big_tables = 0; -SELECT @@session.sql_big_tables; -SET @@session.sql_big_tables = 1; -SELECT @@session.sql_big_tables; - - ---echo '#--------------------FN_DYNVARS_154_04-------------------------#' -########################################################################### -# Change the value of sql_big_tables to invalid value # -########################################################################### - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = -1; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = 2; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = ÕN; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = OF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = ÓFF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = '¹'; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_big_tables = NO; - - ---echo '#-------------------FN_DYNVARS_154_05----------------------------#' -########################################################################### -# Test if accessing global sql_big_tables gives error # -########################################################################### - -SET @@global.sql_big_tables = 1-@@global.sql_big_tables; -SELECT @@global.sql_big_tables; -SET @@global.sql_big_tables = 1-@@global.sql_big_tables; -SELECT @@global.sql_big_tables; - ---echo '#----------------------FN_DYNVARS_154_06------------------------#' -######################################################################### -# Check if the value in GLOBAL Table contains variable value # -######################################################################### - -SELECT count(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='sql_big_tables'; - ---echo '#----------------------FN_DYNVARS_154_07------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - -SELECT IF(@@session.sql_big_tables, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_big_tables'; -SELECT @@session.sql_big_tables; -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_big_tables'; - ---echo '#---------------------FN_DYNVARS_154_08-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - -SET @@session.sql_big_tables = OFF; -SELECT @@session.sql_big_tables; -SET @@session.sql_big_tables = ON; -SELECT @@session.sql_big_tables; - ---echo '#---------------------FN_DYNVARS_154_09----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@session.sql_big_tables = TRUE; -SELECT @@session.sql_big_tables; -SET @@session.sql_big_tables = FALSE; -SELECT @@session.sql_big_tables; - -############################## -# Restore initial value # -############################## - -SET @@session.sql_big_tables = @session_start_value; -SELECT @@session.sql_big_tables; - -############################################################### -# END OF sql_big_tables TESTS # -############################################################### diff --git a/mysql-test/suite/sys_vars/t/sql_big_tables_func.test b/mysql-test/suite/sys_vars/t/sql_big_tables_func.test deleted file mode 100644 index 8bbec202efa..00000000000 --- a/mysql-test/suite/sys_vars/t/sql_big_tables_func.test +++ /dev/null @@ -1,145 +0,0 @@ -############# mysql-test\t\sql_big_tables_func.test ######################## -# # -# Variable Name: sql_big_tables # -# Scope: SESSION # -# Access Type: Dynamic # -# Data Type: BOOLEAN # -# Default Value: 0 FALSE # -# Values: 1 TRUE, 0 FALSE # -# # -# # -# Creation Date: 2008-02-25 # -# Author: Sharique Abdullah # -# # -# Description: Test Cases of Dynamic System Variable "sql_big_tables" # -# that checks behavior of this variable in the following ways # -# * Functionality based on different values # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/set-option.html # -# # -############################################################################ - -# Due to difference in the result the ps-protocol is disabled ---disable_ps_protocol - ---echo ** Setup ** ---echo -# -# Setup -# - -SET @old_big_tables = @@SESSION.sql_big_tables; - -# -# Create tables -# - -CREATE TABLE t1(a varchar(20), b varchar(20)); - -INSERT INTO t1 VALUES('aa','bb'); -INSERT INTO t1 VALUES('aa','bb'); -INSERT INTO t1 VALUES('aa','bb'); -INSERT INTO t1 VALUES('aa','bb'); -INSERT INTO t1 VALUES('aa','bb'); - ---echo '#--------------------FN_DYNVARS_155_01-------------------------#' -# -# TRUE mode -# - -SET SESSION sql_big_tables = 1; - -let $diskTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1); -let $totalTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1); - -eval SET @diskTableCount = $diskTablesBig; -eval SET @tempTableCount = $totalTablesBig; - -select count(a), b from t1 group by b; - -let $newDiskTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1); -let $newTotalTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1); - -eval SET @diskTableCount = $newDiskTablesBig - @diskTableCount; -eval SET @tempTableCount = $newTotalTablesBig - @tempTableCount; - -SELECT @diskTableCount; ---echo 1 Expected -SELECT @tempTableCount; ---echo 1 Expected - ---echo '#--------------------FN_DYNVARS_155_02-------------------------#' -# -# FALSE mode -# - -SET SESSION sql_big_tables = 0; - -let $diskTables = query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1); -let $totalTables = query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1); - -eval SET @diskTableCount = $diskTables; -eval SET @tempTableCount = $totalTables; - -SELECT * FROM (SELECT ta.b as a, tb.a as b FROM t1 as ta INNER JOIN t1 as tb ON ta.a = tb.a) sub; - -let $newDiskTables= query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1); -let $newTotalTables= query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1); - -eval SET @diskTableCount = $newDiskTables - @diskTableCount; -eval SET @tempTableCount = $newTotalTables - @tempTableCount; - -SELECT @diskTableCount; ---echo 0 Expected -SELECT @tempTableCount; ---echo 1 Expected - ---echo '#--------------------FN_DYNVARS_155_03-------------------------#' -# -# Session data integrity check -# ---echo ** Connecting con_int1 using root ** -connect (con_int1,localhost,root,,); ---echo ** Connection con_int1 ** -connection con_int1; - -SELECT @@SESSION.sql_big_tables; ---echo 0 / FALSE Expected; -SET SESSION sql_big_tables = FALSE; - ---echo ** Connecting con_int2 using root ** -connect (con_int2,localhost,root,,); ---echo ** Connection con_int2 ** -connection con_int2; - -SELECT @@SESSION.sql_big_tables; ---echo 0 / FALSE Expected; - -SET SESSION sql_big_tables = TRUE; - ---echo ** Connection con_int1 ** -connection con_int1; -SELECT @@SESSION.sql_big_tables; ---echo 0 / FALSE Expected; - ---echo ** Connection con_int2 ** -connection con_int2; -SELECT @@SESSION.sql_big_tables; ---echo 1 / TRUE Expected; - ---echo ** Connection default ** -connection default; ---echo Disconnecting Connections con_int1, con_int2 -disconnect con_int1; -disconnect con_int2; - -# -# Cleanup -# - -SET SESSION sql_big_tables = @old_big_tables; - -DROP TABLE t1; - ---enable_ps_protocol - diff --git a/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test deleted file mode 100644 index 5b21bd4c79a..00000000000 --- a/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test +++ /dev/null @@ -1,221 +0,0 @@ -############## mysql-test\t\sql_low_priority_updates_basic.test ############### -# # -# Variable Name: sql_low_priority_updates # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: boolean # -# Default Value: # -# Valid Values: 0,1 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -# Description: Test Cases of Dynamic System Variable sql_low_priority_updates # -# that checks the behavior of this variable in the following ways# -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/load_sysvars.inc - -######################################################################## -# START OF sql_low_priority_updates TESTS # -######################################################################## - - -############################################################################### -# Saving initial value of sql_low_priority_updates in a temporary variable # -############################################################################### - -SET @session_start_value = @@session.sql_low_priority_updates; -SELECT @session_start_value; - -SET @global_start_value = @@global.sql_low_priority_updates; -SELECT @global_start_value; - ---echo '#--------------------FN_DYNVARS_159_01------------------------#' -######################################################################## -# Display the DEFAULT value of sql_low_priority_updates # -######################################################################## - -SET @@session.sql_low_priority_updates = 1; -SET @@session.sql_low_priority_updates = DEFAULT; -SELECT @@session.sql_low_priority_updates; - -SET @@global.sql_low_priority_updates = 1; -SET @@global.sql_low_priority_updates = DEFAULT; - ---echo '#---------------------FN_DYNVARS_159_02-------------------------#' -#################################################################################### -# Check if sql_low_priority_updates can be accessed with and without @@ sign # -#################################################################################### - -SET sql_low_priority_updates = 1; -SELECT @@sql_low_priority_updates; - ---Error ER_UNKNOWN_TABLE -SELECT session.sql_low_priority_updates; - ---Error ER_UNKNOWN_TABLE -SELECT local.sql_low_priority_updates; - ---Error ER_UNKNOWN_TABLE -SELECT global.sql_low_priority_updates; - -#using another syntax for accessing system variables -SET session sql_low_priority_updates = 0; -SELECT @@session.sql_low_priority_updates; - -SET global sql_low_priority_updates = 0; -SELECT @@global.sql_low_priority_updates; - - ---echo '#--------------------FN_DYNVARS_159_03------------------------#' -########################################################################## -# change the value of sql_low_priority_updates to a valid value # -########################################################################## -# for session -SET @@session.sql_low_priority_updates = 0; -SELECT @@session.sql_low_priority_updates; -SET @@session.sql_low_priority_updates = 1; -SELECT @@session.sql_low_priority_updates; - -# for global -SET @@global.sql_low_priority_updates = 0; -SELECT @@global.sql_low_priority_updates; -SET @@global.sql_low_priority_updates = 1; -SELECT @@global.sql_low_priority_updates; - - ---echo '#--------------------FN_DYNVARS_159_04-------------------------#' -########################################################################### -# Change the value of sql_low_priority_updates to invalid value # -########################################################################### - -# for session ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_low_priority_updates = -1; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.sql_low_priority_updates = 1.6; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_low_priority_updates = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_low_priority_updates = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_low_priority_updates = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_low_priority_updates = ÕN; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_low_priority_updates = OF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_low_priority_updates = ÓFF; - -# for global - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = -1; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = 2; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = ÕN; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = OF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.sql_low_priority_updates = ÓFF; - - ---echo '#-------------------FN_DYNVARS_159_05----------------------------#' -########################################################################### -# Test if changing global variable effects session and vice versa # -########################################################################### - -SET @@global.sql_low_priority_updates = 0; -SET @@session.sql_low_priority_updates = 1; -SELECT @@global.sql_low_priority_updates AS res_is_0; - -SET @@global.sql_low_priority_updates = 0; -SELECT @@session.sql_low_priority_updates AS res_is_1; - ---echo '#----------------------FN_DYNVARS_159_06------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - -SELECT IF(@@global.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='sql_low_priority_updates'; -SELECT @@global.sql_low_priority_updates; -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='sql_low_priority_updates'; - ---echo '#----------------------FN_DYNVARS_159_07------------------------#' -######################################################################### -# Check if the value in SESSION Table matches value in variable # -######################################################################### - -SELECT IF(@@session.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_low_priority_updates'; -SELECT @@session.sql_low_priority_updates; -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_low_priority_updates'; - ---echo '#---------------------FN_DYNVARS_159_08-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - -SET @@session.sql_low_priority_updates = OFF; -SELECT @@session.sql_low_priority_updates; -SET @@session.sql_low_priority_updates = ON; -SELECT @@session.sql_low_priority_updates; - -SET @@global.sql_low_priority_updates = OFF; -SELECT @@global.sql_low_priority_updates; -SET @@global.sql_low_priority_updates = ON; -SELECT @@global.sql_low_priority_updates; - ---echo '#---------------------FN_DYNVARS_159_09----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@session.sql_low_priority_updates = TRUE; -SELECT @@session.sql_low_priority_updates; -SET @@session.sql_low_priority_updates = FALSE; -SELECT @@session.sql_low_priority_updates; - -SET @@global.sql_low_priority_updates = TRUE; -SELECT @@global.sql_low_priority_updates; -SET @@global.sql_low_priority_updates = FALSE; -SELECT @@global.sql_low_priority_updates; - -############################## -# Restore initial value # -############################## - -SET @@session.sql_low_priority_updates = @session_start_value; -SELECT @@session.sql_low_priority_updates; - -SET @@global.sql_low_priority_updates = @global_start_value; -SELECT @@global.sql_low_priority_updates; - -########################################################### -# END OF sql_low_priority_updates TESTS # -########################################################### - diff --git a/mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test b/mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test deleted file mode 100644 index 9a72846b29c..00000000000 --- a/mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test +++ /dev/null @@ -1,51 +0,0 @@ - -# -# 2010-01-20 OBN - Added check of I_S values after variable value change -# - -SET @start_global_value = @@global.sql_max_join_size; -SELECT @start_global_value; - -# -# exists as global and session -# -select @@global.sql_max_join_size; -select @@session.sql_max_join_size; -show global variables like 'sql_max_join_size'; -show session variables like 'sql_max_join_size'; -select * from information_schema.global_variables where variable_name='sql_max_join_size'; -select * from information_schema.session_variables where variable_name='sql_max_join_size'; - -# -# show that it's writable -# -set global sql_max_join_size=10; -set session sql_max_join_size=20; -select @@global.sql_max_join_size; -select @@session.sql_max_join_size; -show global variables like 'sql_max_join_size'; -show session variables like 'sql_max_join_size'; -select * from information_schema.global_variables where variable_name='sql_max_join_size'; -select * from information_schema.session_variables where variable_name='sql_max_join_size'; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global sql_max_join_size=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global sql_max_join_size=1e1; ---error ER_WRONG_TYPE_FOR_VAR -set global sql_max_join_size="foo"; - -# -# affects OPTION_BIG_SELECTS -# -select @@sql_big_selects; -set sql_max_join_size=cast(-1 as unsigned int); -select @@sql_big_selects; -set sql_max_join_size=100; -select @@sql_big_selects; - -SET @@global.sql_max_join_size = @start_global_value; -SELECT @@global.sql_max_join_size; diff --git a/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test b/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test deleted file mode 100644 index 17b7d911b94..00000000000 --- a/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test +++ /dev/null @@ -1,133 +0,0 @@ -############# mysql-test\t\sql_max_join_size_func.test #################### -# # -# Variable Name: sql_max_join_size # -# Scope: GLOBAL & SESSION # -# Access Type: Dynamic # -# Data Type: BOOLEAN # -# Default Value: 4294967295 # -# Values: 1-4294967295 # -# # -# # -# Creation Date: 2008-02-25 # -# Author: Sharique Abdullah # -# # -# Description: Test Cases of Dynamic System Variable "sql_max_join_size" # -# that checks behavior of this variable in the following ways# -# * Functionality based on different values # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system # -# -variables.html#option_mysqld_max_join_size # -# # -########################################################################### - ---echo ** Setup ** -# -# Setup -# - -SET @session_max_join_size = @@SESSION.sql_max_join_size; -SET @global_max_join_size = @@GLOBAL.sql_max_join_size; -SET @session_sql_big_selects = @@SESSION.sql_big_selects; - -# -# Create tables -# - -CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20)); -CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20)); - -INSERT INTO t1 VALUES('aa','bb'); -INSERT INTO t1 VALUES('aa1','bb'); -INSERT INTO t1 VALUES('aa2','bb'); -INSERT INTO t1 VALUES('aa3','bb'); -INSERT INTO t1 VALUES('aa4','bb'); - -INSERT INTO t2 VALUES('aa','bb'); -INSERT INTO t2 VALUES('aa1','bb'); -INSERT INTO t2 VALUES('aa2','bb'); -INSERT INTO t2 VALUES('aa3','bb'); -INSERT INTO t2 VALUES('aa4','bb'); - ---echo '#--------------------FN_DYNVARS_161_01-------------------------#' -# -# Testing fail condition -# - -SET SESSION sql_max_join_size=9; ---error ER_TOO_BIG_SELECT -SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a; ---echo Expected error The SELECT would examine more than MAX_JOIN_SIZE rows. - ---echo '#--------------------FN_DYNVARS_161_02-------------------------#' -# -# Testing pass conditions -# - -SET SESSION SQL_BIG_SELECTS = 1; - -SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a; ---echo This should work - -SET SESSION sql_max_join_size=DEFAULT; - -DELETE FROM t2 WHERE a = 'aa4'; -SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a; ---echo This should work - ---echo '#----------------------------FN_DYNVARS_136_05-------------------------#' -# -# Session data integrity check & GLOBAL Value check -# - -SET GLOBAL sql_max_join_size = 4; ---echo ** Connecting con_int1 using root ** -connect (con_int1,localhost,root,,); - ---echo ** Connection con_int1 ** -connection con_int1; -SELECT @@SESSION.sql_max_join_size; ---echo 4 Expected - -SET SESSION sql_max_join_size = 2; ---echo ** Connecting con_int2 using root ** -connect (con_int2,localhost,root,,); - ---echo ** Connection con_int2 ** -connection con_int2; -SELECT @@SESSION.sql_max_join_size; ---echo 4 Expected - -SET SESSION sql_max_join_size = 10; - ---echo ** Connection con_int2 ** -connection con_int2; -SELECT @@SESSION.sql_max_join_size; ---echo 10 Expected - ---echo ** Connection con_int1 ** -connection con_int1; -SELECT @@SESSION.sql_max_join_size; ---echo 2 Expected - - -SELECT @@GLOBAL.sql_max_join_size; ---echo 4 Expected - ---echo ** Connection default ** -connection default; - ---echo Disconnecting Connections con_int1, con_int2 -disconnect con_int1; -disconnect con_int2; - - -# -# Cleanup -# - -SET @@SESSION.sql_max_join_size = @session_max_join_size; -SET @@GLOBAL.sql_max_join_size = @global_max_join_size ; -SET @@SESSION.sql_big_selects = @session_sql_big_selects; - -DROP TABLE t1; -DROP TABLE t2; diff --git a/mysql-test/t/bootstrap.test b/mysql-test/t/bootstrap.test index 405c24a6d74..2c6040af7a1 100644 --- a/mysql-test/t/bootstrap.test +++ b/mysql-test/t/bootstrap.test @@ -56,7 +56,6 @@ drop table t1; --echo # # need the --skip-innodb option present for the test to succeed -SHOW VARIABLES LIKE 'have_innodb'; SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb' and SUPPORT='YES'; diff --git a/mysql-test/t/events_logs_tests.test b/mysql-test/t/events_logs_tests.test index 3240dccbc76..c3bbff90723 100644 --- a/mysql-test/t/events_logs_tests.test +++ b/mysql-test/t/events_logs_tests.test @@ -46,7 +46,7 @@ call select_general_log(); --echo Check slow query log --echo --echo Ensure that slow logging is on -show variables like 'log_slow_queries'; +show variables like 'slow_query_log'; --echo --echo Demonstrate that session value has no effect --echo diff --git a/mysql-test/t/log_state-master.opt b/mysql-test/t/log_state-master.opt index 3e8a84b8d7a..858bf269a7d 100644 --- a/mysql-test/t/log_state-master.opt +++ b/mysql-test/t/log_state-master.opt @@ -1 +1 @@ ---log-output=TABLE,FILE --general-log=0 --log-slow-queries --slow-query-log=0 +--log-output=TABLE,FILE --general-log=0 --slow-query-log=0 diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test index 0b900b14b0b..3231769a4bf 100644 --- a/mysql-test/t/log_state.test +++ b/mysql-test/t/log_state.test @@ -18,8 +18,7 @@ set global general_log= OFF; truncate table mysql.general_log; truncate table mysql.slow_log; show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; flush logs; set global general_log= ON; create table t1(f1 int); @@ -32,8 +31,7 @@ select * from mysql.general_log; set global general_log= ON; flush logs; show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; --echo # Establish connection con1 (user=root) connect (con1,localhost,root,,); @@ -63,8 +61,7 @@ select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%'; --echo # Switch to connection default connection default; show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; set global general_log= ON; set global general_log= OFF; @@ -85,8 +82,7 @@ truncate table mysql.general_log; select * from mysql.general_log; set global general_log= ON; show global variables -where Variable_name = 'log' or Variable_name = 'log_slow_queries' or -Variable_name = 'general_log' or Variable_name = 'slow_query_log'; +where Variable_name = 'general_log' or Variable_name = 'slow_query_log'; --replace_column 2 # show variables like 'general_log_file'; @@ -206,42 +202,6 @@ SET GLOBAL slow_query_log = @old_slow_query_log; ########################################################################### # -# Bug#29131: SHOW VARIABLES reports variable 'log' but SET doesn't recognize it -# - -SET GLOBAL general_log = ON; - -SHOW VARIABLES LIKE 'general_log'; -SHOW VARIABLES LIKE 'log'; -SELECT @@general_log, @@log; -SET GLOBAL log = 0; -SHOW VARIABLES LIKE 'general_log'; -SHOW VARIABLES LIKE 'log'; -SELECT @@general_log, @@log; -SET GLOBAL general_log = 1; -SHOW VARIABLES LIKE 'general_log'; -SHOW VARIABLES LIKE 'log'; -SELECT @@general_log, @@log; - -SHOW VARIABLES LIKE 'slow_query_log'; -SHOW VARIABLES LIKE 'log_slow_queries'; -SELECT @@slow_query_log, @@log_slow_queries; -SET GLOBAL log_slow_queries = 0; -SHOW VARIABLES LIKE 'slow_query_log'; -SHOW VARIABLES LIKE 'log_slow_queries'; -SELECT @@slow_query_log, @@log_slow_queries; -SET GLOBAL slow_query_log = 1; -SHOW VARIABLES LIKE 'slow_query_log'; -SHOW VARIABLES LIKE 'log_slow_queries'; -SELECT @@slow_query_log, @@log_slow_queries; - -SET GLOBAL general_log = @old_general_log; -SET GLOBAL slow_query_log = @old_slow_query_log; - - -########################################################################### - -# # Bug#31604: server crash when setting slow_query_log_file/general_log_file # @@ -284,37 +244,6 @@ SET GLOBAL slow_query_log_file = @old_slow_query_log_file; ########################################################################### -# WL#4403 - deprecate @log and @slow_log_queries variables - -# These server system variables are all deprecated -# -- show for command-line as well! ---echo deprecated: -SET GLOBAL log = 0; -SET GLOBAL log_slow_queries = 0; -SET GLOBAL log = DEFAULT; -SET GLOBAL log_slow_queries = DEFAULT; - -# These server system variables are NOT deprecated. ---echo not deprecated: -SELECT @@global.general_log_file INTO @my_glf; -SELECT @@global.slow_query_log_file INTO @my_sqlf; -SET GLOBAL general_log = 0; -SET GLOBAL slow_query_log = 0; -SET GLOBAL general_log_file = 'WL4403_G.log'; -SET GLOBAL slow_query_log_file = 'WL4403_SQ.log'; -SET GLOBAL general_log_file = @my_glf; -SET GLOBAL slow_query_log_file = @my_sqlf; -SET GLOBAL general_log = DEFAULT; -SET GLOBAL slow_query_log = DEFAULT; - -## Reset to initial values -SET @@global.general_log = @old_general_log; -SET @@global.general_log_file = @old_general_log_file; -SET @@global.slow_query_log = @old_slow_query_log; -SET @@global.slow_query_log_file = @old_slow_query_log_file; - -########################################################################### - --echo # --echo # Bug #49756 Rows_examined is always 0 in the slow query log --echo # for update statements diff --git a/mysql-test/t/no-threads-master.opt b/mysql-test/t/no-threads-master.opt index e263cad427c..33e3e97bc0e 100644 --- a/mysql-test/t/no-threads-master.opt +++ b/mysql-test/t/no-threads-master.opt @@ -1 +1 @@ ---one-thread --thread-handling=no-threads +--thread-handling=no-threads diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test index 6a82a2901c5..1cc3badc93f 100644 --- a/mysql-test/t/select.test +++ b/mysql-test/t/select.test @@ -1424,9 +1424,9 @@ drop table tmp; # big table done -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; select distinct fld5 from t2 limit 10; @@ -1435,9 +1435,9 @@ select distinct fld5 from t2 limit 10; # select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET SQL_BIG_TABLES=1; # Force use of MyISAM +SET BIG_TABLES=1; # Force use of MyISAM select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; # diff --git a/mysql-test/t/show_check-master.opt b/mysql-test/t/show_check-master.opt index 108caf42203..a16d72855a2 100644 --- a/mysql-test/t/show_check-master.opt +++ b/mysql-test/t/show_check-master.opt @@ -1 +1 @@ ---log-output=table,file --log-slow-queries --log-queries-not-using-indexes --myisam-recover="" +--log-output=table,file --slow-query-log --log-queries-not-using-indexes --myisam-recover="" diff --git a/mysql-test/t/subselect4.test b/mysql-test/t/subselect4.test index e427253f65f..b9fb052e42b 100644 --- a/mysql-test/t/subselect4.test +++ b/mysql-test/t/subselect4.test @@ -298,18 +298,15 @@ CREATE TABLE `t1` ( ) AUTO_INCREMENT=12 DEFAULT CHARSET=latin1; INSERT INTO `t1` VALUES (10,'00:00:00','i','i'),(11,'00:00:00','',''); -set @old_optimizer_switch = @@session.optimizer_switch, - @old_engine_condition_pushdown = @@session.engine_condition_pushdown; +set @old_optimizer_switch = @@session.optimizer_switch; -SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on'; -SET SESSION engine_condition_pushdown = 1; +SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on,engine_condition_pushdown=on'; SELECT `time_nokey` G1 FROM t1 WHERE ( `varchar_nokey` , `varchar_key` ) IN ( SELECT `varchar_nokey` , `varchar_nokey` ) AND `varchar_key` >= 'c' HAVING G1 ORDER BY `pk` ; -set @@session.optimizer_switch = @old_optimizer_switch, - @@session.engine_condition_pushdown = @old_engine_condition_pushdown; +set @@session.optimizer_switch = @old_optimizer_switch; DROP TABLE t1; @@ -476,8 +473,8 @@ INSERT INTO t2 VALUES (9,1); --echo # Enable Index condition pushdown --replace_column 1 # -SELECT @old_icp:=@@engine_condition_pushdown; -SET SESSION engine_condition_pushdown = 'ON'; +set @old_icp=@@optimizer_switch; +SET SESSION optimizer_switch="engine_condition_pushdown=on"; --echo SELECT pk @@ -490,7 +487,7 @@ WHERE ORDER BY t1.i2 desc); --echo # Restore old value for Index condition pushdown -SET SESSION engine_condition_pushdown=@old_icp; +SET SESSION optimizer_switch=@old_icp; DROP TABLE t1,t2; diff --git a/mysql-test/t/subselect_mat_cost-master.opt b/mysql-test/t/subselect_mat_cost-master.opt index f188fad94fe..cb4a9db9617 100644 --- a/mysql-test/t/subselect_mat_cost-master.opt +++ b/mysql-test/t/subselect_mat_cost-master.opt @@ -1 +1 @@ ---log-output=TABLE,FILE --general-log --log-slow-queries --slow-query-log=1 +--log-output=TABLE,FILE --general-log --slow-query-log=1 diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 21112cd7130..65109516681 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -337,11 +337,9 @@ select @@sql_auto_is_null; set @@sql_auto_is_null=0; select @@sql_auto_is_null; set sql_big_selects=1; -set sql_big_tables=1; set sql_buffer_result=1; set sql_log_bin=1; set sql_log_off=1; -set sql_low_priority_updates=1; set sql_quote_show_create=1; set sql_safe_updates=1; set sql_select_limit=1; @@ -517,14 +515,6 @@ set character_set_results=NULL; select ifnull(@@character_set_results,"really null"); set names latin1; - -# -# Bug #9613: @@have_innodb -# - ---replace_column 1 # -select @@have_innodb; - # # Tests for lc_time_names # Note, when adding new locales, please fix ID accordingly: diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index ea36c7691b0..3fd25e5c5c8 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -87,8 +87,7 @@ CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL -- Create general_log if CSV is enabled. -SET @have_csv = 'NO'; -SET @have_csv = (SELECT @@have_csv); +SET @have_csv = (SELECT support FROM information_schema.engines WHERE engine = 'CSV'); SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, user_host MEDIUMTEXT NOT NULL, thread_id BIGINT(21) UNSIGNED NOT NULL, server_id INTEGER UNSIGNED NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0'); PREPARE stmt FROM @str; @@ -136,8 +135,7 @@ CREATE TABLE IF NOT EXISTS innodb_index_stats ( SET SESSION sql_mode=@sql_mode_orig; -SET @have_innodb = 'NO'; -SET @have_innodb = (SELECT @@have_innodb); +SET @have_innodb = (SELECT support FROM information_schema.engines WHERE engine = 'InnoDB'); SET @cmd="CREATE TABLE IF NOT EXISTS slave_relay_log_info ( Number_of_lines INTEGER UNSIGNED NOT NULL COMMENT 'Number of lines in the file or rows in the table. Used to version table definitions.', diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c3c64480616..1aee7efda30 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4669,13 +4669,6 @@ a file name for --log-bin-index option", opt_binlog_index_name); } plugins_are_initialized= TRUE; /* Don't separate from init function */ - have_csv= plugin_status(STRING_WITH_LEN("csv"), - MYSQL_STORAGE_ENGINE_PLUGIN); - have_ndbcluster= plugin_status(STRING_WITH_LEN("ndbcluster"), - MYSQL_STORAGE_ENGINE_PLUGIN); - have_partitioning= plugin_status(STRING_WITH_LEN("partition"), - MYSQL_STORAGE_ENGINE_PLUGIN); - /* we do want to exit if there are any other unknown options */ if (remaining_argc > 1) { @@ -6759,14 +6752,6 @@ struct my_option my_long_options[]= "Log slow statements executed by slave thread to the slow log if it is open.", &opt_log_slow_slave_statements, &opt_log_slow_slave_statements, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"log-slow-queries", OPT_SLOW_QUERY_LOG, - "Enable logging of slow queries (longer than --long-query-time) to log file " - "or table. Optional argument is a file name for the slow log. If not given, " - "'log-basename'-slow.log will be used. Use --log-output=TABLE if you want " - "to have the log in the table mysql.slow_log. " - "Deprecated option, use --slow-query-log/--slow-query-log-file instead.", - &opt_slow_logname, &opt_slow_logname, 0, GET_STR_ALLOC, OPT_ARG, - 0, 0, 0, 0, 0, 0}, {"log-tc", 0, "Path to transaction coordinator log (used for transactions that affect " "more than one storage engine, when binary log is disabled).", @@ -6795,10 +6780,6 @@ struct my_option my_long_options[]= #endif /* HAVE_REPLICATION */ {"memlock", 0, "Lock mysqld in memory.", &locked_in_memory, &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"one-thread", OPT_ONE_THREAD, - "(Deprecated): Only use one thread (for debugging under Linux). Use " - "thread-handling=no-threads instead.", - 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"old-style-user-limits", 0, "Enable old-style user limits (before 5.0.3, user resources were counted " "per each user+host vs. per account).", @@ -6886,10 +6867,6 @@ struct my_option my_long_options[]= {"skip-slave-start", 0, "If set, slave is not autostarted.", &opt_skip_slave_start, &opt_skip_slave_start, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"skip-thread-priority", OPT_SKIP_PRIOR, - "Don't give threads different priorities. This option is deprecated " - "because it has no effect; the implied behavior is already the default.", - 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #if defined(_WIN32) && !defined(EMBEDDED_LIBRARY) {"slow-start-timeout", 0, "Maximum number of milliseconds that the service control manager should wait " @@ -8092,10 +8069,6 @@ mysqld_get_one_option(int optid, if (default_collation_name == compiled_default_collation_name) default_collation_name= 0; break; - case 'l': - WARN_DEPRECATED(NULL, 10, 1, "--log", "'--general-log'/'--general-log-file'"); - opt_log=1; - break; case 'h': strmake_buf(mysql_real_data_home, argument); /* Correct pointer set by my_getopt (for embedded library) */ @@ -8257,10 +8230,6 @@ mysqld_get_one_option(int optid, break; } #endif /* HAVE_REPLICATION */ - case (int) OPT_SLOW_QUERY_LOG: - WARN_DEPRECATED(NULL, 10, 1, "--log-slow-queries", "'--slow-query-log'/'--slow-query-log-file'"); - opt_slow_log= 1; - break; case (int) OPT_SAFE: opt_specialflag|= SPECIAL_SAFE_MODE | SPECIAL_NO_NEW_FUNC; delay_key_write_options= (uint) DELAY_KEY_WRITE_NONE; @@ -8272,12 +8241,6 @@ mysqld_get_one_option(int optid, sql_print_warning("The syntax '--safe-mode' is deprecated and will be " "removed in a future release."); break; - case (int) OPT_SKIP_PRIOR: - opt_specialflag|= SPECIAL_NO_PRIOR; - sql_print_warning("The --skip-thread-priority startup option is deprecated " - "and will be removed in MySQL 11.0. This option has no effect " - "as the implied behavior is already the default."); - break; case (int) OPT_SKIP_HOST_CACHE: opt_specialflag|= SPECIAL_NO_HOST_CACHE; break; @@ -8299,9 +8262,6 @@ mysqld_get_one_option(int optid, server_id_supplied = 1; ::server_id= global_system_variables.server_id; break; - case OPT_ONE_THREAD: - thread_handling= SCHEDULER_NO_THREADS; - break; case OPT_LOWER_CASE_TABLE_NAMES: lower_case_table_names_used= 1; break; diff --git a/sql/mysqld.h b/sql/mysqld.h index 1f210edd354..78d49e865d8 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -541,7 +541,6 @@ enum options_mysqld OPT_MAX_LONG_DATA_SIZE, OPT_PLUGIN_LOAD, OPT_PLUGIN_LOAD_ADD, - OPT_ONE_THREAD, OPT_PFS_INSTRUMENT, OPT_POOL_OF_THREADS, OPT_REPLICATE_DO_DB, @@ -555,11 +554,9 @@ enum options_mysqld OPT_SERVER_ID, OPT_SKIP_HOST_CACHE, OPT_SKIP_LOCK, - OPT_SKIP_PRIOR, OPT_SKIP_RESOLVE, OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS, - OPT_SLOW_QUERY_LOG, OPT_SSL_CA, OPT_SSL_CAPATH, OPT_SSL_CERT, diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 941587150f3..6d2a33450de 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1175,10 +1175,6 @@ static void plugin_deinitialize(struct st_plugin_int *plugin, bool ref_check) } plugin->state= PLUGIN_IS_UNINITIALIZED; - /* maintain the obsolete @@have_innodb variable */ - if (!my_strcasecmp(&my_charset_latin1, plugin->name.str, "InnoDB")) - have_innodb= SHOW_OPTION_DISABLED; - /* We do the check here because NDB has a worker THD which doesn't exit until NDB is shut down. @@ -1403,11 +1399,6 @@ err: mysql_mutex_lock(&LOCK_plugin); plugin->state= state; - /* maintain the obsolete @@have_innodb variable */ - if (!my_strcasecmp(&my_charset_latin1, plugin->name.str, "InnoDB")) - have_innodb= state & PLUGIN_IS_READY ? SHOW_OPTION_YES - : SHOW_OPTION_DISABLED; - DBUG_RETURN(ret); } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b2b269da4f2..50b30d94f53 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7682,10 +7682,6 @@ opt_to: | AS {} ; -/* - SLAVE START and SLAVE STOP are deprecated. We keep them for compatibility. -*/ - slave: START_SYM SLAVE optional_connection_name slave_thread_opts { @@ -7717,20 +7713,6 @@ slave: lex->type = 0; /* If you change this code don't forget to update SLAVE STOP too */ } - | SLAVE optional_connection_name START_SYM slave_thread_opts - { - LEX *lex=Lex; - lex->sql_command = SQLCOM_SLAVE_START; - lex->type = 0; - } - slave_until - {} - | SLAVE optional_connection_name STOP_SYM slave_thread_opts - { - LEX *lex=Lex; - lex->sql_command = SQLCOM_SLAVE_STOP; - lex->type = 0; - } ; start: diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 1dfdc37a989..bb96d69ebc5 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1175,15 +1175,6 @@ static Sys_var_mybool Sys_low_priority_updates( DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_low_prio_updates)); -#ifndef TO_BE_DELETED /* Alias for the low_priority_updates */ -static Sys_var_mybool Sys_sql_low_priority_updates( - "sql_low_priority_updates", - "INSERT/DELETE/UPDATE has lower priority than selects", - SESSION_VAR(low_priority_updates), NO_CMD_LINE, - DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_low_prio_updates)); -#endif - static Sys_var_mybool Sys_lower_case_file_system( "lower_case_file_system", "Case sensitivity of file names on the file system where the " @@ -1626,13 +1617,6 @@ static Sys_var_ulong Sys_max_length_for_sort_data( SESSION_VAR(max_length_for_sort_data), CMD_LINE(REQUIRED_ARG), VALID_RANGE(4, 8192*1024L), DEFAULT(1024), BLOCK_SIZE(1)); -static Sys_var_harows Sys_sql_max_join_size( - "sql_max_join_size", "Alias for max_join_size", - SESSION_VAR(max_join_size), NO_CMD_LINE, - VALID_RANGE(1, HA_POS_ERROR), DEFAULT(HA_POS_ERROR), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_max_join_size), DEPRECATED("'@@max_join_size'")); - static Sys_var_ulong Sys_max_long_data_size( "max_long_data_size", "The maximum BLOB length to send to server from " @@ -2901,27 +2885,6 @@ static Sys_var_ulong Sys_net_wait_timeout( VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -/** propagates changes to the relevant flag of @@optimizer_switch */ -static bool fix_engine_condition_pushdown(sys_var *self, THD *thd, - enum_var_type type) -{ - SV *sv= (type == OPT_GLOBAL) ? &global_system_variables : &thd->variables; - if (sv->engine_condition_pushdown) - sv->optimizer_switch|= OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN; - else - sv->optimizer_switch&= ~OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN; - return false; -} -static Sys_var_mybool Sys_engine_condition_pushdown( - "engine_condition_pushdown", - "Push supported query conditions to the storage engine." - " Deprecated, use --optimizer-switch instead.", - SESSION_VAR(engine_condition_pushdown), - CMD_LINE(OPT_ARG, OPT_ENGINE_CONDITION_PUSHDOWN), - DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), - ON_UPDATE(fix_engine_condition_pushdown), - DEPRECATED("'@@optimizer_switch'")); - static Sys_var_plugin Sys_default_storage_engine( "default_storage_engine", "The default storage engine for new tables", SESSION_VAR(table_plugin), NO_CMD_LINE, @@ -3041,12 +3004,6 @@ static Sys_var_mybool Sys_big_tables( "temporary sets on file (Solves most 'table full' errors)", SESSION_VAR(big_tables), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); -#ifndef TO_BE_DELETED /* Alias for big_tables */ -static Sys_var_mybool Sys_sql_big_tables( - "sql_big_tables", "alias for big_tables", - SESSION_VAR(big_tables), NO_CMD_LINE, DEFAULT(FALSE)); -#endif - static Sys_var_bit Sys_big_selects( "sql_big_selects", "sql_big_selects", SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_BIG_SELECTS, @@ -3537,25 +3494,6 @@ static Sys_var_charptr Sys_slow_log_path( IN_FS_CHARSET, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_log_path), ON_UPDATE(fix_slow_log_file)); -/// @todo deprecate these four legacy have_PLUGIN variables and use I_S instead -export SHOW_COMP_OPTION have_csv, have_innodb= SHOW_OPTION_DISABLED; -export SHOW_COMP_OPTION have_ndbcluster, have_partitioning; -static Sys_var_have Sys_have_csv( - "have_csv", "have_csv", - READ_ONLY GLOBAL_VAR(have_csv), NO_CMD_LINE); - -static Sys_var_have Sys_have_innodb( - "have_innodb", "have_innodb", - READ_ONLY GLOBAL_VAR(have_innodb), NO_CMD_LINE); - -static Sys_var_have Sys_have_ndbcluster( - "have_ndbcluster", "have_ndbcluster", - READ_ONLY GLOBAL_VAR(have_ndbcluster), NO_CMD_LINE); - -static Sys_var_have Sys_have_partition_db( - "have_partitioning", "have_partitioning", - READ_ONLY GLOBAL_VAR(have_partitioning), NO_CMD_LINE); - static Sys_var_have Sys_have_compress( "have_compress", "have_compress", READ_ONLY GLOBAL_VAR(have_compress), NO_CMD_LINE); @@ -3605,13 +3543,6 @@ static Sys_var_mybool Sys_general_log( DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_log_state)); -// Synonym of "general_log" for consistency with SHOW VARIABLES output -static Sys_var_mybool Sys_log( - "log", "Alias for --general-log. Deprecated", - GLOBAL_VAR(opt_log), NO_CMD_LINE, - DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_log_state), DEPRECATED("'@@general_log'")); - static Sys_var_mybool Sys_slow_query_log( "slow_query_log", "Log slow queries to a table or log file. Defaults logging to a file " @@ -3621,27 +3552,19 @@ static Sys_var_mybool Sys_slow_query_log( DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_log_state)); -/* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */ -static Sys_var_mybool Sys_log_slow( - "log_slow_queries", - "Alias for --slow-query-log. Deprecated", - GLOBAL_VAR(opt_slow_log), NO_CMD_LINE, - DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_log_state), DEPRECATED("'@@slow_query_log'")); - static bool fix_log_state(sys_var *self, THD *thd, enum_var_type type) { bool res; my_bool *UNINIT_VAR(newvalptr), newval, UNINIT_VAR(oldval); uint UNINIT_VAR(log_type); - if (self == &Sys_general_log || self == &Sys_log) + if (self == &Sys_general_log) { newvalptr= &opt_log; oldval= logger.get_log_file_handler()->is_open(); log_type= QUERY_LOG_GENERAL; } - else if (self == &Sys_slow_query_log || self == &Sys_log_slow) + else if (self == &Sys_slow_query_log) { newvalptr= &opt_slow_log; oldval= logger.get_slow_log_file_handler()->is_open(); diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c index eb88be5c0e8..6dcfb697dbe 100644 --- a/tests/mysql_client_fw.c +++ b/tests/mysql_client_fw.c @@ -275,7 +275,9 @@ static my_bool check_have_innodb(MYSQL *conn) int rc; my_bool result; - rc= mysql_query(conn, "show variables like 'have_innodb'"); + rc= mysql_query(conn, + "SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') " + "AS `TRUE` FROM information_schema.engines WHERE engine = 'innodb'"); myquery(rc); res= mysql_use_result(conn); DIE_UNLESS(res); @@ -283,7 +285,7 @@ static my_bool check_have_innodb(MYSQL *conn) row= mysql_fetch_row(res); DIE_UNLESS(row); - result= strcmp(row[1], "YES") == 0; + result= strcmp(row[1], "1") == 0; mysql_free_result(res); return result; } |