diff --git a/mysql-test/include/default_optimizer_switch.inc b/mysql-test/include/default_optimizer_switch.inc index 8634c2eee22..5790cec4bc1 100644 --- a/mysql-test/include/default_optimizer_switch.inc +++ b/mysql-test/include/default_optimizer_switch.inc @@ -8,7 +8,7 @@ set @save_optimizer_switch=@@optimizer_switch; set @save_join_cache_level=@@join_cache_level; -set optimizer_switch="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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on"; +set optimizer_switch="index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on"; set optimizer_use_condition_selectivity=4; set optimizer_search_depth=62; diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index aabe3d7521b..ce1d38b1f94 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -1497,7 +1497,7 @@ sub mysql_client_test_arguments() if ( $opt_debug ) { mtr_add_arg($args, - "--debug=d:t:A,$path_vardir_trace/log/mysql_client_test.trace"); + "--debug-dbug=d:t:A,$path_vardir_trace/log/mysql_client_test.trace"); } if ( $glob_use_embedded_server ) @@ -1535,7 +1535,7 @@ sub mysql_upgrade_arguments() if ( $opt_debug ) { mtr_add_arg($args, - "--debug=d:t:A,$path_vardir_trace/log/mysql_upgrade.trace"); + "--debug-dbug=d:t:A,$path_vardir_trace/log/mysql_upgrade.trace"); } return join(" ", $exe, @$args); @@ -1663,7 +1663,7 @@ sub environment_setup () { if ( $opt_debug ) { $cmdline_mysqlcheck .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlcheck.trace"; + " --debug-dbug=d:t:A,$path_vardir_trace/log/mysqlcheck.trace"; } $ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck; @@ -1676,9 +1676,9 @@ sub environment_setup () { if ( $opt_debug ) { $cmdline_mysqldump .= - " --debug=d:t:A,$path_vardir_trace/log/mysqldump-master.trace"; + " --debug-dbug=d:t:A,$path_vardir_trace/log/mysqldump-master.trace"; $cmdline_mysqldumpslave .= - " --debug=d:t:A,$path_vardir_trace/log/mysqldump-slave.trace"; + " --debug-dbug=d:t:A,$path_vardir_trace/log/mysqldump-slave.trace"; } $ENV{'MYSQL_DUMP'}= $cmdline_mysqldump; $ENV{'MYSQL_DUMP_SLAVE'}= $cmdline_mysqldumpslave; @@ -1698,7 +1698,7 @@ sub environment_setup () { if ( $opt_debug ) { $cmdline_mysqlslap .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace"; + " --debug-dbug=d:t:A,$path_vardir_trace/log/mysqlslap.trace"; } $ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap; } @@ -1715,7 +1715,7 @@ sub environment_setup () { if ( $opt_debug ) { $cmdline_mysqlimport .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlimport.trace"; + " --debug-dbug=d:t:A,$path_vardir_trace/log/mysqlimport.trace"; } $ENV{'MYSQL_IMPORT'}= $cmdline_mysqlimport; @@ -1732,7 +1732,7 @@ sub environment_setup () { if ( $opt_debug ) { $cmdline_mysqlshow .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlshow.trace"; + " --debug-dbug=d:t:A,$path_vardir_trace/log/mysqlshow.trace"; } $ENV{'MYSQL_SHOW'}= $cmdline_mysqlshow; @@ -1753,7 +1753,7 @@ sub environment_setup () { if ( $opt_debug ) { $cmdline_mysqlbinlog .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlbinlog.trace"; + " --debug-dbug=d:t:A,$path_vardir_trace/log/mysqlbinlog.trace"; } $ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog; @@ -2460,7 +2460,7 @@ sub install_db ($$) { if ( $opt_debug ) { - mtr_add_arg($args, "--debug=d:t:i:A,%s/log/bootstrap_%s.trace", + mtr_add_arg($args, "--debug-dbug=d:t:i:A,%s/log/bootstrap_%s.trace", $path_vardir_trace, $type); } @@ -3186,7 +3186,7 @@ sub mysqld_arguments ($$$$) { { if ( $opt_debug ) { - mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s%s.trace", + mtr_add_arg($args, "%s--debug-dbug=d:t:i:A,%s/log/%s%s.trace", $prefix, $path_vardir_trace, $mysqld->{'type'}, $sidx); } else @@ -3825,7 +3825,7 @@ sub run_mysqltest ($) { if ( $opt_debug ) { - mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", + mtr_add_arg($args, "--debug-dbug=d:t:A,%s/log/mysqltest.trace", $path_vardir_trace); } diff --git a/mysql-test/main/connect2.result b/mysql-test/main/connect2.result index 5430626a533..5ea681c34ca 100644 --- a/mysql-test/main/connect2.result +++ b/mysql-test/main/connect2.result @@ -1,5 +1,5 @@ call mtr.add_suppression("Allocation failed"); -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set @old_thread_cache_size=@@global.thread_cache_size; set @@global.thread_cache_size=0; connect con1,localhost,root,,test,,; diff --git a/mysql-test/main/connect2.test b/mysql-test/main/connect2.test index 9d2a438aa0a..486bbd5741e 100644 --- a/mysql-test/main/connect2.test +++ b/mysql-test/main/connect2.test @@ -5,7 +5,7 @@ --source include/not_embedded.inc --source include/have_debug.inc call mtr.add_suppression("Allocation failed"); -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set @old_thread_cache_size=@@global.thread_cache_size; set @@global.thread_cache_size=0; # Test connections to the diff --git a/mysql-test/main/create_or_replace2.result b/mysql-test/main/create_or_replace2.result index c02a384e152..90258d2355a 100644 --- a/mysql-test/main/create_or_replace2.result +++ b/mysql-test/main/create_or_replace2.result @@ -1,7 +1,7 @@ include/master-slave.inc [connection master] drop table if exists t1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; CREATE TABLE t1 (i INT, KEY(i)) ENGINE=InnoDB; CREATE OR REPLACE TEMPORARY TABLE tmp (a int, b int, key(a)) engine=myisam; SET debug_dbug='+d,send_kill_after_delete'; diff --git a/mysql-test/main/create_or_replace2.test b/mysql-test/main/create_or_replace2.test index 80c8b635d8d..fc951aa8b0f 100644 --- a/mysql-test/main/create_or_replace2.test +++ b/mysql-test/main/create_or_replace2.test @@ -10,7 +10,7 @@ --disable_warnings drop table if exists t1; --enable_warnings -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; # # MDEV-5854 diff --git a/mysql-test/main/date_formats-master.opt b/mysql-test/main/date_formats-master.opt deleted file mode 100644 index ab243fe729c..00000000000 --- a/mysql-test/main/date_formats-master.opt +++ /dev/null @@ -1 +0,0 @@ ---date-format=%d.%m.%Y --time-format=%H.%i.%s diff --git a/mysql-test/main/date_formats.result b/mysql-test/main/date_formats.result index 463cce39520..a9e400805ca 100644 --- a/mysql-test/main/date_formats.result +++ b/mysql-test/main/date_formats.result @@ -1,24 +1,6 @@ -drop table if exists t1; -SELECT variable_name, variable_value -FROM information_schema.global_variables -WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -ORDER BY variable_name; -variable_name variable_value -DATETIME_FORMAT %Y-%m-%d %H:%i:%s -DATE_FORMAT %d.%m.%Y -TIME_FORMAT %H.%i.%s -SELECT variable_name, variable_value -FROM information_schema.session_variables -WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -ORDER BY variable_name; -variable_name variable_value -DATETIME_FORMAT %Y-%m-%d %H:%i:%s -DATE_FORMAT %d.%m.%Y -TIME_FORMAT %H.%i.%s select str_to_date(concat('15-01-2001',' 2:59:58.999'), -concat('%d-%m-%Y',' ','%H:%i:%s.%f')); -str_to_date(concat('15-01-2001',' 2:59:58.999'), -concat('%d-%m-%Y',' ','%H:%i:%s.%f')) +concat('%d-%m-%Y',' ','%H:%i:%s.%f')) as s; +s 2001-01-15 02:59:58.999000 select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T'); STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T') @@ -256,8 +238,8 @@ Tuesday 52 2001 %W %V %X 00:00:00.000000 15-01-2001 %d-%m-%Y %H:%i:%S 00:00:00.000000 15-01-20 %d-%m-%y 00:00:00.000000 15-2001-1 %d-%Y-%c 00:00:00.000000 -select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')); -concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')) +select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')) as s; +s 2003-01-02 08:11:02.123456 truncate table t1; insert into t1 values @@ -551,8 +533,8 @@ Thursday 01 January 2009 # Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr' # SET NAMES utf8; -SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))); -LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) +SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) as s; +s % SET NAMES latin1; # diff --git a/mysql-test/main/date_formats.test b/mysql-test/main/date_formats.test index 4f252f29a69..0e6f0f8ec85 100644 --- a/mysql-test/main/date_formats.test +++ b/mysql-test/main/date_formats.test @@ -2,134 +2,12 @@ # Test of date format functions # -#remove this include after fix MDEV-27871 --- source include/no_view_protocol.inc - ---disable_warnings -drop table if exists t1; ---enable_warnings - -SELECT variable_name, variable_value -FROM information_schema.global_variables -WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -ORDER BY variable_name; - -SELECT variable_name, variable_value -FROM information_schema.session_variables -WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -ORDER BY variable_name; - -# -# The following tests will work only when we at some point will enable -# dynamic changing of formats -# - -# SET time_format='%H%i%s'; -# SET time_format='%H:%i:%s.%f'; -# SET time_format='%h-%i-%s.%f%p'; -# SET time_format='%h:%i:%s.%f %p'; -# SET time_format='%h:%i:%s%p'; -# -# SET date_format='%Y%m%d'; -# SET date_format='%Y.%m.%d'; -# SET date_format='%d.%m.%Y'; -# SET date_format='%m-%d-%Y'; -# -# --error ER_WRONG_VALUE_FOR_VAR -# SET datetime_format= NULL; -# set datetime_format= '%Y%m%d%H%i%s'; -# set datetime_format= '%Y-%m-%d %H:%i:%s'; -# set datetime_format= '%m-%d-%y %H:%i:%s.%f'; -# set datetime_format= '%d-%m-%Y %h:%i:%s%p'; -# set datetime_format= '%H:%i:%s %Y-%m-%d'; -# set datetime_format= '%H:%i:%s.%f %m-%d-%Y'; -# set datetime_format= '%h:%i:%s %p %Y-%m-%d'; -# set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d'; -# -# SELECT variable_name, variable_value -# FROM information_schema.session_variables -# WHERE variable_name IN ('date_format', 'datetime_format', 'time_format') -# ORDER BY variable_name; -# -# --error 1231 -# SET time_format='%h:%i:%s'; -# --error 1231 -# SET time_format='%H %i:%s'; -# --error 1231 -# SET time_format='%H::%i:%s'; -# --error 1231 -# SET time_format='%H:%i:%s%f'; -# --error 1231 -# SET time_format='%H:%i.%f:%s'; -# --error 1231 -# SET time_format='%H:%i:%s%p'; -# --error 1231 -# SET time_format='%h:%i:%s.%f %p %Y-%m-%d'; -# --error 1231 -# SET time_format='%H%i%s.%f'; -# --error 1231 -# SET time_format='%H:%i-%s.%f'; -# --error 1231 -# SET date_format='%d.%m.%d'; -# --error 1231 -# SET datetime_format='%h.%m.%y %d.%i.%s'; -# --error 1231 -# set datetime_format= '%H:%i:%s.%f %p %Y-%m-%d'; -# -# # -# # Test GLOBAL values -# -# set GLOBAL datetime_format= '%H:%i:%s %Y-%m-%d'; -# SET SESSION datetime_format=default; -# select @@global.datetime_format, @@session.datetime_format; -# SET GLOBAL datetime_format=default; -# SET SESSION datetime_format=default; -# select @@global.datetime_format, @@session.datetime_format; -# -# SET GLOBAL date_format=default; -# SET GLOBAL time_format=default; -# SET GLOBAL datetime_format=default; -# SET time_format=default; -# SET date_format=default; -# SET datetime_format=default; - -# SET date_format='%d.%m.%Y'; -# select CAST('01.01.2001' as DATE) as a; -# SET datetime_format='%d.%m.%Y %H.%i.%s'; -# select CAST('01.01.2001 05.12.06' as DATETIME) as a; -# SET time_format='%H.%i.%s'; -# select CAST('05.12.06' as TIME) as a; -# -# SET datetime_format='%d.%m.%Y %h:%i:%s %p'; -# select CAST('01.01.2001 05:12:06AM' as DATETIME) as a; -# select CAST('01.01.2001 05:12:06 PM' as DATETIME) as a; -# -# SET time_format='%h:%i:%s %p'; -# select CAST('05:12:06 AM' as TIME) as a; -# select CAST('05:12:06.1234PM' as TIME) as a; -# -# SET time_format='%h.%i.%s %p'; -# SET date_format='%d.%m.%y'; -# SET datetime_format='%d.%m.%y %h.%i.%s %p'; -# select CAST('12-12-06' as DATE) as a; -# -# select adddate('01.01.97 11.59.59.000001 PM', 10); -# select datediff('31.12.97 11.59:59.000001 PM','01.01.98'); -# select weekofyear('31.11.97 11:59:59.000001 PM'); -# select makedate(1997,1); -# select addtime('31.12.97 11.59.59.999999 PM', '1 1.1.1.000002'); -# select maketime(23,11,12); -# select timediff('01.01.97 11:59:59.000001 PM','31.12.95 11:59:59.000002 PM'); -# -# SET time_format='%i:%s:%H'; -# select cast(str_to_date('15-01-2001 12:59:59', '%d-%m-%Y %H:%i:%S') as TIME); - # # Test of str_to_date # select str_to_date(concat('15-01-2001',' 2:59:58.999'), - concat('%d-%m-%Y',' ','%H:%i:%s.%f')); + concat('%d-%m-%Y',' ','%H:%i:%s.%f')) as s; select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T'); create table t1 (date char(30), format char(30) not null); @@ -175,7 +53,7 @@ select date,format,DATE(str_to_date(date, format)) as date2 from t1; select date,format,TIME(str_to_date(date, format)) as time from t1; select date,format,concat(TIME(str_to_date(date, format))) as time2 from t1; # Test small bug in %f handling -select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')); +select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')) as s; # Test wrong dates or converion specifiers @@ -363,7 +241,7 @@ SELECT DATE_FORMAT("2009-01-01",'%W %d %M %Y') as valid_date; --echo # Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr' --echo # SET NAMES utf8; -SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))); +SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) as s; SET NAMES latin1; --echo # diff --git a/mysql-test/main/filesort_debug.result b/mysql-test/main/filesort_debug.result index 0280d378778..2d7d815100f 100644 --- a/mysql-test/main/filesort_debug.result +++ b/mysql-test/main/filesort_debug.result @@ -1,5 +1,5 @@ call mtr.add_suppression("Sort aborted.*"); -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; # # Bug#36022 please log more information about "Sort aborted" queries # diff --git a/mysql-test/main/filesort_debug.test b/mysql-test/main/filesort_debug.test index d5dc6a89507..8f0fba099bc 100644 --- a/mysql-test/main/filesort_debug.test +++ b/mysql-test/main/filesort_debug.test @@ -4,7 +4,7 @@ call mtr.add_suppression("Sort aborted.*"); -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; --echo # --echo # Bug#36022 please log more information about "Sort aborted" queries diff --git a/mysql-test/main/locale.result b/mysql-test/main/locale.result index 90ee859d2fa..71707c60147 100644 --- a/mysql-test/main/locale.result +++ b/mysql-test/main/locale.result @@ -1,5 +1,3 @@ -DROP TABLE IF EXISTS t1; -Start of 5.4 tests # # WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT # @@ -50,11 +48,7 @@ DROP TABLE t1; # Bug#46633 Obsolete Serbian locale name # SET lc_messages=sr_YU; -Warnings: -Warning 1287 'sr_YU' ist veraltet. Bitte benutzen Sie 'sr_RS' -SHOW VARIABLES LIKE 'lc_messages'; -Variable_name Value -lc_messages sr_RS +ERROR HY000: Unbekannte Locale: 'sr_YU' SET lc_messages=sr_RS; SHOW VARIABLES LIKE 'lc_messages'; Variable_name Value diff --git a/mysql-test/main/locale.test b/mysql-test/main/locale.test index 85077641110..a0224fe072a 100644 --- a/mysql-test/main/locale.test +++ b/mysql-test/main/locale.test @@ -1,9 +1,3 @@ ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - ---echo Start of 5.4 tests - --echo # --echo # WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT --echo # @@ -34,8 +28,8 @@ DROP TABLE t1; --echo # --echo # Bug#46633 Obsolete Serbian locale name --echo # +--error ER_UNKNOWN_LOCALE SET lc_messages=sr_YU; -SHOW VARIABLES LIKE 'lc_messages'; SET lc_messages=sr_RS; SHOW VARIABLES LIKE 'lc_messages'; SET lc_time_names=sr_RS; diff --git a/mysql-test/main/lock_sync.test b/mysql-test/main/lock_sync.test index 0d15f8459b6..5543420d824 100644 --- a/mysql-test/main/lock_sync.test +++ b/mysql-test/main/lock_sync.test @@ -1108,7 +1108,7 @@ DROP TABLES t1, t2; --echo # MDEV-28567 Assertion `0' in open_tables upon function-related operation --echo # # To get MDL trace run this case like this: -# mtr --mysqld=--debug=d,mdl,query:i:o,/tmp/mdl.log ... +# mtr --mysqld=--debug-dbug=d,mdl,query:i:o,/tmp/mdl.log ... # Cleanup trace like this: # sed -i -re '/(mysql|performance_schema|sys|mtr)\// d; /MDL_BACKUP_|MDL_INTENTION_/ d; /\/(t2|tr1|tr2)/ d' /tmp/mdl.log diff --git a/mysql-test/main/multi_update_big.test b/mysql-test/main/multi_update_big.test index d6fec704822..d8a464f92ed 100644 --- a/mysql-test/main/multi_update_big.test +++ b/mysql-test/main/multi_update_big.test @@ -8,7 +8,7 @@ # # If we are running with # - Valgrind -> $VALGRIND_TEST <> 0 -# - debug tracing -> @@session.debug LIKE '%trace%' +# - debug tracing -> @@session.debug_dbug LIKE '%trace%' # the resource consumption (storage space needed, runtime) will be extreme. # Therefore we require that the option "--big-test" is also set. # @@ -16,12 +16,12 @@ let $need_big= 0; --disable_query_log --error 0,ER_UNKNOWN_SYSTEM_VARIABLE -SET @aux = @@session.debug; +SET @aux = @@session.debug_dbug; if (!$mysql_errno) { - # We have returncode 0 = the server system variable @@session.debug exists. + # We have returncode 0 = the server system variable @@session.debug_dbug exists. # But we only need "--big-test" in case of tracing. - if (`SELECT @@session.debug LIKE '%trace%'`) + if (`SELECT @@session.debug_dbug LIKE '%trace%'`) { let $need_big= 1; } diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 3c5d7c59134..77d6d10b3e6 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -199,9 +199,6 @@ The following specify which files/extra groups are read (specified before remain window on windows. --core-file Write core on crashes -h, --datadir=name Path to the database root directory - --date-format=name The DATE format (ignored) - --datetime-format=name - The DATETIME format (ignored) --deadlock-search-depth-long=# Long search depth for the two-step deadlock detection --deadlock-search-depth-short=# @@ -645,7 +642,6 @@ The following specify which files/extra groups are read (specified before remain seconds will be aborted. The argument will be treated as a decimal value with microsecond precision. A value of 0 (default) means no timeout - --max-tmp-tables=# Unused, will be removed. --max-user-connections=# The maximum number of active connections for a single user (0 = no limit) @@ -791,14 +787,13 @@ The following specify which files/extra groups are read (specified before remain list of option=value pairs, where value is on, off, or default, and options are: index_merge, index_merge_union, index_merge_sort_union, index_merge_intersection, - index_merge_sort_intersection, engine_condition_pushdown, - index_condition_pushdown, derived_merge, - derived_with_keys, firstmatch, loosescan, materialization, - in_to_exists, semijoin, partial_match_rowid_merge, - partial_match_table_scan, subquery_cache, mrr, - mrr_cost_based, mrr_sort_keys, outer_join_with_cache, - semijoin_with_cache, join_cache_incremental, - join_cache_hashed, join_cache_bka, + index_merge_sort_intersection, index_condition_pushdown, + derived_merge, derived_with_keys, firstmatch, loosescan, + materialization, in_to_exists, semijoin, + partial_match_rowid_merge, partial_match_table_scan, + subquery_cache, mrr, mrr_cost_based, mrr_sort_keys, + outer_join_with_cache, semijoin_with_cache, + join_cache_incremental, join_cache_hashed, join_cache_bka, optimize_join_buffer_size, table_elimination, extended_keys, exists_to_in, orderby_uses_equalities, condition_pushdown_for_derived, split_materialized, @@ -1499,7 +1494,6 @@ The following specify which files/extra groups are read (specified before remain worker thread is stalled, additional worker thread may be created to handle remaining clients. --thread-stack=# The stack size for each thread - --time-format=name The TIME format (ignored) --tls-version=name TLS protocol version for secure connections.. Any combination of: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3 --tmp-disk-table-size=# @@ -1591,8 +1585,6 @@ completion-type NO_CHAIN concurrent-insert AUTO console TRUE core-file TRUE -date-format %Y-%m-%d -datetime-format %Y-%m-%d %H:%i:%s deadlock-search-depth-long 15 deadlock-search-depth-short 4 deadlock-timeout-long 50000000 @@ -1720,7 +1712,6 @@ max-session-mem-used 9223372036854775807 max-sort-length 1024 max-sp-recursion-depth 0 max-statement-time 0 -max-tmp-tables 32 max-user-connections 0 max-write-lock-count 18446744073709551615 memlock FALSE @@ -1764,7 +1755,7 @@ optimizer-rowid-copy-cost 0.002653 optimizer-scan-setup-cost 10 optimizer-search-depth 62 optimizer-selectivity-sampling-limit 100 -optimizer-switch 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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on optimizer-trace optimizer-trace-max-mem-size 1048576 optimizer-use-condition-selectivity 4 @@ -1939,7 +1930,6 @@ thread-pool-prio-kickup-timer 1000 thread-pool-priority auto thread-pool-stall-limit 500 thread-stack 299008 -time-format %H:%i:%s tmp-disk-table-size 18446744073709551615 tmp-memory-table-size 16777216 tmp-table-size 16777216 diff --git a/mysql-test/main/mysqltest_tracking_info.result b/mysql-test/main/mysqltest_tracking_info.result index 624a6e16fd4..71a1e5413a2 100644 --- a/mysql-test/main/mysqltest_tracking_info.result +++ b/mysql-test/main/mysqltest_tracking_info.result @@ -35,13 +35,11 @@ SET @@session.session_track_system_variables= @save_session_track_system_variabl # set @save_optimizer_switch=@@optimizer_switch; SET @@session.session_track_system_variables='optimizer_switch'; -set optimizer_switch='index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=on,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off'; +set optimizer_switch='index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=on,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES -- optimizer_switch --- index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=on,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +-- index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=on,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on -Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release set @@optimizer_switch=@save_optimizer_switch; SET @@session.session_track_system_variables= @save_session_track_system_variables; # End of 10.2 tests diff --git a/mysql-test/main/mysqltest_tracking_info.test b/mysql-test/main/mysqltest_tracking_info.test index 44fb6ec8225..feb52fab8e3 100644 --- a/mysql-test/main/mysqltest_tracking_info.test +++ b/mysql-test/main/mysqltest_tracking_info.test @@ -36,7 +36,7 @@ set @save_optimizer_switch=@@optimizer_switch; SET @@session.session_track_system_variables='optimizer_switch'; --enable_session_track_info -set optimizer_switch='index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=on,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off'; +set optimizer_switch='index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_merge_sort_intersection=on,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=on,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off'; --disable_session_track_info set @@optimizer_switch=@save_optimizer_switch; diff --git a/mysql-test/main/mysqltest_tracking_info_debug.result b/mysql-test/main/mysqltest_tracking_info_debug.result index 39d17c7ca34..2fd20f99379 100644 --- a/mysql-test/main/mysqltest_tracking_info_debug.result +++ b/mysql-test/main/mysqltest_tracking_info_debug.result @@ -7,7 +7,7 @@ set @save_session_track_system_variables=@@session_track_system_variables; # is declared to never be null in my_strdup # # check that that parser problems do not lead to crash -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_dbug="+d,dbug_session_tracker_parse_error"; SET GLOBAL session_track_system_variables='query_cache_size'; ERROR HY001: Out of memory; restart server and try again (needed 1 bytes) diff --git a/mysql-test/main/mysqltest_tracking_info_debug.test b/mysql-test/main/mysqltest_tracking_info_debug.test index 1699801f318..32d65bfd181 100644 --- a/mysql-test/main/mysqltest_tracking_info_debug.test +++ b/mysql-test/main/mysqltest_tracking_info_debug.test @@ -15,7 +15,7 @@ set @save_session_track_system_variables=@@session_track_system_variables; --echo # --echo # check that that parser problems do not lead to crash -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_dbug="+d,dbug_session_tracker_parse_error"; --error ER_OUTOFMEMORY SET GLOBAL session_track_system_variables='query_cache_size'; diff --git a/mysql-test/main/show_analyze.result b/mysql-test/main/show_analyze.result index dc5ef3cb22a..6f4159804f4 100644 --- a/mysql-test/main/show_analyze.result +++ b/mysql-test/main/show_analyze.result @@ -1,6 +1,6 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_sync='RESET'; create table t0 (a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -18,7 +18,7 @@ show analyze for (select a from t0 limit 1); ERROR HY000: You may only use constant expressions in this statement connect con1, localhost, root,,; connection con1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; show analyze for $thr2; ERROR HY000: Target is not executing an operation with a query plan diff --git a/mysql-test/main/show_analyze.test b/mysql-test/main/show_analyze.test index 58d36d7dd16..832c8d7a378 100644 --- a/mysql-test/main/show_analyze.test +++ b/mysql-test/main/show_analyze.test @@ -12,7 +12,7 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; --enable_warnings -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; # # Testcases in this file do not work with embedded server. The reason for this @@ -61,7 +61,7 @@ let $thr1=`select connection_id()`; connect (con1, localhost, root,,); connection con1; let $thr2=`select connection_id()`; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; # SHOW ANALYZE FOR diff --git a/mysql-test/main/show_analyze_json.result b/mysql-test/main/show_analyze_json.result index aa14c4cbb63..66b94a6b383 100644 --- a/mysql-test/main/show_analyze_json.result +++ b/mysql-test/main/show_analyze_json.result @@ -1,6 +1,6 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_sync='RESET'; create table t0 (a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -20,7 +20,7 @@ show analyze format=JSON for (select a from t0 limit 1); ERROR HY000: You may only use constant expressions in this statement connect con1, localhost, root,,; connection con1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; show analyze format = JSON for $thr2; ERROR HY000: Target is not executing an operation with a query plan diff --git a/mysql-test/main/show_analyze_json.test b/mysql-test/main/show_analyze_json.test index cd221854446..b0847d861c9 100644 --- a/mysql-test/main/show_analyze_json.test +++ b/mysql-test/main/show_analyze_json.test @@ -12,7 +12,7 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; --enable_warnings -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; # # Testcases in this file do not work with embedded server. The reason for this @@ -67,7 +67,7 @@ let $thr1=`select connection_id()`; connect (con1, localhost, root,,); connection con1; let $thr2=`select connection_id()`; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; # SHOW ANALYZE FOR diff --git a/mysql-test/main/show_explain.result b/mysql-test/main/show_explain.result index ce335819324..1f6f3a0feb2 100644 --- a/mysql-test/main/show_explain.result +++ b/mysql-test/main/show_explain.result @@ -1,6 +1,6 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_sync='RESET'; create table t0 (a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -23,7 +23,7 @@ explain for connection (select max(a) from t0); ERROR HY000: You may only use constant expressions in this statement connect con1, localhost, root,,; connection con1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; show explain for $thr2; ERROR HY000: Target is not executing an operation with a query plan diff --git a/mysql-test/main/show_explain.test b/mysql-test/main/show_explain.test index e6cf3971738..6d7207b0832 100644 --- a/mysql-test/main/show_explain.test +++ b/mysql-test/main/show_explain.test @@ -16,7 +16,7 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; --enable_warnings -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; # # Testcases in this file do not work with embedded server. The reason for this @@ -84,7 +84,7 @@ let $thr1=`select connection_id()`; connect (con1, localhost, root,,); connection con1; let $thr2=`select connection_id()`; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; # SHOW EXPLAIN FOR diff --git a/mysql-test/main/show_explain_json.result b/mysql-test/main/show_explain_json.result index 4a21528e41d..1b6a19d24c5 100644 --- a/mysql-test/main/show_explain_json.result +++ b/mysql-test/main/show_explain_json.result @@ -1,6 +1,6 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_sync='RESET'; create table t0 (a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -23,7 +23,7 @@ explain FORMAT=json for connection (select max(a) from t0); ERROR HY000: You may only use constant expressions in this statement connect con1, localhost, root,,; connection con1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; show explain format=JSON for $thr2; ERROR HY000: Target is not executing an operation with a query plan diff --git a/mysql-test/main/show_explain_json.test b/mysql-test/main/show_explain_json.test index 321fa46be87..d5acb8707e2 100644 --- a/mysql-test/main/show_explain_json.test +++ b/mysql-test/main/show_explain_json.test @@ -14,7 +14,7 @@ drop table if exists t0, t1, t2, t3, t4; drop view if exists v1; --enable_warnings -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; # # Testcases in this file do not work with embedded server. The reason for this @@ -82,7 +82,7 @@ let $thr1=`select connection_id()`; connect (con1, localhost, root,,); connection con1; let $thr2=`select connection_id()`; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; connection default; # SHOW EXPLAIN FOR diff --git a/mysql-test/main/show_explain_non_select.result b/mysql-test/main/show_explain_non_select.result index 8d96056ca91..33b512bc467 100644 --- a/mysql-test/main/show_explain_non_select.result +++ b/mysql-test/main/show_explain_non_select.result @@ -1,5 +1,5 @@ drop table if exists t0, t1; -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_sync='RESET'; connect con2, localhost, root,,; connection con2; diff --git a/mysql-test/main/show_explain_non_select.test b/mysql-test/main/show_explain_non_select.test index 92b3c9788c9..6a64d056f95 100644 --- a/mysql-test/main/show_explain_non_select.test +++ b/mysql-test/main/show_explain_non_select.test @@ -10,7 +10,7 @@ drop table if exists t0, t1; --enable_warnings -SET @old_debug= @@session.debug; +SET @old_debug= @@session.debug_dbug; set debug_sync='RESET'; # diff --git a/mysql-test/main/subselect4.result b/mysql-test/main/subselect4.result index 95bc595c8f4..2042dadeb70 100644 --- a/mysql-test/main/subselect4.result +++ b/mysql-test/main/subselect4.result @@ -413,29 +413,6 @@ Note 1276 Field or reference 'test.t1.c' of SELECT #2 was resolved in SELECT #1 Note 1003 /* select#1 */ select (/* select#2 */ select 1 from `test`.`t2` where 0) AS `RESULT` from dual group by NULL DROP TABLE t1,t2; # -# BUG#45928 "Differing query results depending on MRR and -# engine_condition_pushdown settings" -# -CREATE TABLE `t1` ( -`pk` int(11) NOT NULL AUTO_INCREMENT, -`time_nokey` time NOT NULL, -`varchar_key` varchar(1) NOT NULL, -`varchar_nokey` varchar(1) NOT NULL, -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; -SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on,engine_condition_pushdown=on'; -Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release -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; -DROP TABLE t1; -# # During work with BUG#45863 I had problems with a query that was # optimized differently in regular and prepared mode. # Because there was a bug in one of the selected strategies, I became @@ -616,9 +593,7 @@ PRIMARY KEY (pk) INSERT INTO t2 VALUES (9,1); # Enable Index condition pushdown set @old_icp=@@optimizer_switch; -SET SESSION optimizer_switch="engine_condition_pushdown=on"; -Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release +SET SESSION optimizer_switch="index_condition_pushdown=on"; SELECT pk FROM t2 diff --git a/mysql-test/main/subselect4.test b/mysql-test/main/subselect4.test index 05ced31c0b5..7d3716beb07 100644 --- a/mysql-test/main/subselect4.test +++ b/mysql-test/main/subselect4.test @@ -292,33 +292,6 @@ EXPLAIN EXTENDED SELECT (SELECT 1 FROM t2 WHERE d = c) AS RESULT FROM t1 GROUP B DROP TABLE t1,t2; ---echo # ---echo # BUG#45928 "Differing query results depending on MRR and ---echo # engine_condition_pushdown settings" ---echo # - -CREATE TABLE `t1` ( - `pk` int(11) NOT NULL AUTO_INCREMENT, - `time_nokey` time NOT NULL, - `varchar_key` varchar(1) NOT NULL, - `varchar_nokey` varchar(1) NOT NULL, - 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; - -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; - -DROP TABLE t1; - --echo # --echo # During work with BUG#45863 I had problems with a query that was --echo # optimized differently in regular and prepared mode. @@ -483,7 +456,7 @@ INSERT INTO t2 VALUES (9,1); --echo # Enable Index condition pushdown --replace_column 1 # set @old_icp=@@optimizer_switch; -SET SESSION optimizer_switch="engine_condition_pushdown=on"; +SET SESSION optimizer_switch="index_condition_pushdown=on"; --echo SELECT pk diff --git a/mysql-test/main/subselect_debug.result b/mysql-test/main/subselect_debug.result index 9be53ae0473..cc1bfb44561 100644 --- a/mysql-test/main/subselect_debug.result +++ b/mysql-test/main/subselect_debug.result @@ -1,7 +1,7 @@ CREATE TABLE t1(id INT); INSERT INTO t1 VALUES (1),(2),(3),(4); INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d; -SET @orig_debug=@@debug; +SET @orig_debug=@@debug_dbug; SET GLOBAL debug_dbug="d,subselect_exec_fail"; SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1; SUM(EXISTS(SELECT RAND() FROM t1)) diff --git a/mysql-test/main/subselect_debug.test b/mysql-test/main/subselect_debug.test index f27867dc9d0..964f5aef4d7 100644 --- a/mysql-test/main/subselect_debug.test +++ b/mysql-test/main/subselect_debug.test @@ -9,7 +9,7 @@ CREATE TABLE t1(id INT); INSERT INTO t1 VALUES (1),(2),(3),(4); INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d; # Setup the mysqld to crash at certain point -SET @orig_debug=@@debug; +SET @orig_debug=@@debug_dbug; SET GLOBAL debug_dbug="d,subselect_exec_fail"; SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1; SELECT REVERSE(EXISTS(SELECT RAND() FROM t1)); diff --git a/mysql-test/main/subselect_exists2in.result b/mysql-test/main/subselect_exists2in.result index 87ebb2d4a25..8ecdbad6b97 100644 --- a/mysql-test/main/subselect_exists2in.result +++ b/mysql-test/main/subselect_exists2in.result @@ -584,7 +584,7 @@ set optimizer_switch='exists_to_in=on'; # MDEV-243 Wrong result (extra or missing rows) with # exists_to_in + materialization, EXISTS subquery # -SET optimizer_switch='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=on'; +SET optimizer_switch='index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on'; CREATE TABLE t1 ( a VARCHAR(1), b VARCHAR(1) ); INSERT INTO t1 VALUES ('v','v'),('s','v'); SELECT * FROM t1 AS alias diff --git a/mysql-test/main/subselect_exists2in.test b/mysql-test/main/subselect_exists2in.test index 625c007e006..03c2003f1f9 100644 --- a/mysql-test/main/subselect_exists2in.test +++ b/mysql-test/main/subselect_exists2in.test @@ -464,7 +464,7 @@ set optimizer_switch='exists_to_in=on'; --echo # exists_to_in + materialization, EXISTS subquery --echo # -SET optimizer_switch='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=on'; +SET optimizer_switch='index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on'; CREATE TABLE t1 ( a VARCHAR(1), b VARCHAR(1) ); INSERT INTO t1 VALUES ('v','v'),('s','v'); diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl index 20df9a6251e..c08b15be8ef 100755 --- a/mysql-test/mariadb-test-run.pl +++ b/mysql-test/mariadb-test-run.pl @@ -1906,7 +1906,7 @@ sub client_debug_arg($$) { if ( $opt_debug ) { mtr_add_arg($args, - "--loose-debug=$debug_d:t:A,%s/log/%s.trace", + "--loose-debug-dbug=$debug_d:t:A,%s/log/%s.trace", $path_vardir_trace, $client_name) } } diff --git a/mysql-test/suite/binlog/include/binlog_incident-master.opt b/mysql-test/suite/binlog/include/binlog_incident-master.opt index 57ce0081ae5..4e746bf178f 100644 --- a/mysql-test/suite/binlog/include/binlog_incident-master.opt +++ b/mysql-test/suite/binlog/include/binlog_incident-master.opt @@ -1 +1 @@ ---loose-debug=+d,incident_database_resync_on_replace \ No newline at end of file +--loose-debug-dbug=+d,incident_database_resync_on_replace diff --git a/mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt b/mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt index 90c70ecee29..d6f149505cc 100644 --- a/mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt +++ b/mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt @@ -1 +1 @@ ---loose-debug=d,simulate_kill_bug27571 +--loose-debug-dbug=d,simulate_kill_bug27571 diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_freed.result b/mysql-test/suite/encryption/r/innodb_encrypt_freed.result index cdcdd17720e..9d4d99a267a 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_freed.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_freed.result @@ -19,7 +19,7 @@ mysql/innodb_table_stats mysql/transaction_registry test/t1 CREATE TABLE t2 (f1 int not null)engine=innodb; -# restart: --debug=d,ib_log_checkpoint_avoid +# restart: --debug-dbug=d,ib_log_checkpoint_avoid connect con1,localhost,root,,,; begin; insert into t2 values(1); @@ -46,7 +46,7 @@ mysql/transaction_registry test/t1 test/t2 disconnect con1; -# restart: --debug=d,ib_log_checkpoint_avoid +# restart: --debug-dbug=d,ib_log_checkpoint_avoid drop table t1, t2; CREATE TABLE t1(f1 BIGINT PRIMARY KEY, f2 int not null, f3 int not null, index(f1), index idx_1(f2), @@ -60,7 +60,7 @@ mysql/innodb_table_stats mysql/transaction_registry test/t1 CREATE TABLE t2 (f1 int not null)engine=innodb; -# restart: --debug=d,ib_log_checkpoint_avoid +# restart: --debug-dbug=d,ib_log_checkpoint_avoid connect con1,localhost,root,,,; begin; insert into t2 values(1); @@ -77,7 +77,7 @@ test/t1 test/t2 alter table t1 drop index idx_1; disconnect con1; -# restart: --debug=d,ib_log_checkpoint_avoid +# restart: --debug-dbug=d,ib_log_checkpoint_avoid connect con1,localhost,root,,,; begin; insert into t2 values(1); diff --git a/mysql-test/suite/encryption/t/innodb_encrypt_freed.test b/mysql-test/suite/encryption/t/innodb_encrypt_freed.test index 7ba0b5a2d1a..85d232bc1ac 100644 --- a/mysql-test/suite/encryption/t/innodb_encrypt_freed.test +++ b/mysql-test/suite/encryption/t/innodb_encrypt_freed.test @@ -21,7 +21,7 @@ CREATE TABLE t1(f1 BIGINT PRIMARY KEY, f2 int not null, SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; CREATE TABLE t2 (f1 int not null)engine=innodb; -let $restart_parameters="--debug=d,ib_log_checkpoint_avoid"; +let $restart_parameters="--debug-dbug=d,ib_log_checkpoint_avoid"; --source include/restart_mysqld.inc # Stop the purge diff --git a/mysql-test/suite/engines/rr_trx/include/rr_init.test b/mysql-test/suite/engines/rr_trx/include/rr_init.test index 579df37dc06..95ace24b7d1 100644 --- a/mysql-test/suite/engines/rr_trx/include/rr_init.test +++ b/mysql-test/suite/engines/rr_trx/include/rr_init.test @@ -9,7 +9,6 @@ if (`SELECT @@default_storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`) # Not applicable to 5.1 server or earlier. --disable_query_log SET GLOBAL optimizer_use_mrr='disable'; - SET GLOBAL engine_condition_pushdown=off; --enable_query_log } diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index 84dd782999d..59dd47036c4 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -19,7 +19,6 @@ ORDER BY VARIABLE_NAME; VARIABLE_NAME VARIABLE_VALUE WSREP_ALLOWLIST WSREP_AUTO_INCREMENT_CONTROL ON -WSREP_CAUSAL_READS ON WSREP_CERTIFICATION_RULES strict WSREP_CERTIFY_NONPK ON WSREP_CLUSTER_ADDRESS gcomm:// diff --git a/mysql-test/suite/galera/r/galera_var_sync_wait.result b/mysql-test/suite/galera/r/galera_var_sync_wait.result index 80fbd3f3e05..d3d8f3ef8c8 100644 --- a/mysql-test/suite/galera/r/galera_var_sync_wait.result +++ b/mysql-test/suite/galera/r/galera_var_sync_wait.result @@ -6,9 +6,6 @@ connection node_1; SELECT @@global.wsrep_sync_wait; @@global.wsrep_sync_wait 15 -SELECT @@global.wsrep_causal_reads; -@@global.wsrep_causal_reads -1 connection node_1; CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB; connection node_2; diff --git a/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt b/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt index 0b35236062b..4d11610bff5 100644 --- a/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt +++ b/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt @@ -1 +1 @@ ---wsrep-sync-wait=0 --wsrep-causal-reads=OFF \ No newline at end of file +--wsrep-sync-wait=0 diff --git a/mysql-test/suite/galera/t/galera_var_sync_wait.test b/mysql-test/suite/galera/t/galera_var_sync_wait.test index ecb0d92b891..3022471ca39 100644 --- a/mysql-test/suite/galera/t/galera_var_sync_wait.test +++ b/mysql-test/suite/galera/t/galera_var_sync_wait.test @@ -10,7 +10,6 @@ --echo # # galera_2nodes.cnf sets wsrep_sync_wait to 7 SELECT @@global.wsrep_sync_wait; -SELECT @@global.wsrep_causal_reads; --let $wsrep_sync_wait_orig = `SELECT @@wsrep_sync_wait` diff --git a/mysql-test/suite/innodb/r/innodb-blob.result b/mysql-test/suite/innodb/r/innodb-blob.result index 63c52f2e6e5..634a3ee9a87 100644 --- a/mysql-test/suite/innodb/r/innodb-blob.result +++ b/mysql-test/suite/innodb/r/innodb-blob.result @@ -19,9 +19,7 @@ a RIGHT(b,20) 1 aaaaaaaaaaaaaaaaaaaa 2 bbbbbbbbbbbbbbbbbbbb connection default; -SET DEBUG='+d,row_ins_extern_checkpoint'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET DEBUG_DBUG='+d,row_ins_extern_checkpoint'; SET DEBUG_SYNC='before_row_ins_extern_latch SIGNAL rec_not_blob WAIT_FOR crash'; ROLLBACK; BEGIN; @@ -87,9 +85,7 @@ connect con2,localhost,root,,; BEGIN; INSERT INTO t2 VALUES (347); connection default; -SET DEBUG='+d,row_upd_extern_checkpoint'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET DEBUG_DBUG='+d,row_upd_extern_checkpoint'; SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR crash'; UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2; connection con2; @@ -125,9 +121,7 @@ connect con2,localhost,root,,; BEGIN; INSERT INTO t2 VALUES (33101); connection default; -SET DEBUG='+d,row_upd_extern_checkpoint'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET DEBUG_DBUG='+d,row_upd_extern_checkpoint'; SET DEBUG_SYNC='after_row_upd_extern SIGNAL have_latch WAIT_FOR crash'; UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2; connection con2; diff --git a/mysql-test/suite/innodb/r/innodb-index-debug.result b/mysql-test/suite/innodb/r/innodb-index-debug.result index 8c200109aa4..426712631c0 100644 --- a/mysql-test/suite/innodb/r/innodb-index-debug.result +++ b/mysql-test/suite/innodb/r/innodb-index-debug.result @@ -87,9 +87,7 @@ SIGNAL opened WAIT_FOR flushed'; ALTER TABLE t1 FORCE, ADD COLUMN k4 int; connection default; SET DEBUG_SYNC= 'now WAIT_FOR opened'; -SET debug = '+d,row_log_tmpfile_fail'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET debug_dbug = '+d,row_log_tmpfile_fail'; INSERT INTO t1 select NULL,'aaa','bbb' from t480; INSERT INTO t1 select NULL,'aaaa','bbbb' from t480; SET DEBUG_SYNC= 'now SIGNAL flushed'; diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result index 8ac0d4d41fa..8143a18972a 100644 --- a/mysql-test/suite/innodb/r/innodb-table-online.result +++ b/mysql-test/suite/innodb/r/innodb-table-online.result @@ -35,17 +35,11 @@ SET @saved_debug_dbug = @@SESSION.debug_dbug; SET DEBUG_DBUG = '+d,innodb_OOM_prepare_inplace_alter'; ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; ERROR HY000: Out of memory. -SET SESSION DEBUG = @saved_debug_dbug; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead -SET SESSION DEBUG = '+d,innodb_OOM_inplace_alter'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET SESSION DEBUG_DBUG = @saved_debug_dbug; +SET SESSION DEBUG_DBUG = '+d,innodb_OOM_inplace_alter'; ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; ERROR HY000: Out of memory. -SET SESSION DEBUG = @saved_debug_dbug; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET SESSION DEBUG_DBUG = @saved_debug_dbug; ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; connection default; SHOW CREATE TABLE t1; diff --git a/mysql-test/suite/innodb/r/log_file_size.result b/mysql-test/suite/innodb/r/log_file_size.result index 7b4935e1ab1..71fe06cf23b 100644 --- a/mysql-test/suite/innodb/r/log_file_size.result +++ b/mysql-test/suite/innodb/r/log_file_size.result @@ -31,7 +31,7 @@ connection default; SELECT * FROM t1; ERROR 42000: Unknown storage engine 'InnoDB' FOUND 1 /syntax error in innodb_log_group_home_dir/ in mysqld.1.err -# restart: --debug=d,innodb_log_abort_1 +# restart: --debug-dbug=d,innodb_log_abort_1 SELECT * FROM t1; ERROR 42000: Unknown storage engine 'InnoDB' FOUND 1 /InnoDB: Starting crash recovery from checkpoint LSN=.*/ in mysqld.1.err @@ -39,7 +39,7 @@ FOUND 1 /InnoDB: Starting crash recovery from checkpoint LSN=.*/ in mysqld.1.err SELECT * FROM t1; ERROR 42000: Unknown storage engine 'InnoDB' FOUND 1 /InnoDB: innodb_read_only prevents crash recovery/ in mysqld.1.err -# restart: --debug=d,innodb_log_abort_5 +# restart: --debug-dbug=d,innodb_log_abort_5 SELECT * FROM t1; ERROR 42000: Unknown storage engine 'InnoDB' FOUND 1 /redo log from 5\.000MiB to [0-9.]*[KMGT]iB/ in mysqld.1.err diff --git a/mysql-test/suite/innodb/r/page_reorganize.result b/mysql-test/suite/innodb/r/page_reorganize.result index 20e1600bd0d..c86d0cf9875 100644 --- a/mysql-test/suite/innodb/r/page_reorganize.result +++ b/mysql-test/suite/innodb/r/page_reorganize.result @@ -15,9 +15,7 @@ connection default; SET @save_dbug = @@debug_dbug; SET DEBUG_DBUG = '+d,do_page_reorganize,do_lock_reverse_page_reorganize'; insert into t1(f2) values (repeat('+', 100)); -SET DEBUG = @save_dbug; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET DEBUG_DBUG = @save_dbug; commit; connection con1; f1 diff --git a/mysql-test/suite/innodb/t/innodb-blob.test b/mysql-test/suite/innodb/t/innodb-blob.test index 9ae13ca2fec..3755bf54735 100644 --- a/mysql-test/suite/innodb/t/innodb-blob.test +++ b/mysql-test/suite/innodb/t/innodb-blob.test @@ -50,7 +50,7 @@ connection con1; reap; connection default; reap; -SET DEBUG='+d,row_ins_extern_checkpoint'; +SET DEBUG_DBUG='+d,row_ins_extern_checkpoint'; SET DEBUG_SYNC='before_row_ins_extern_latch SIGNAL rec_not_blob WAIT_FOR crash'; ROLLBACK; BEGIN; @@ -126,7 +126,7 @@ connection default; # remain open while we are writing the off-page columns and are # stuck in the DEBUG_SYNC. A checkpoint involves a flush, which # would wait for the buffer-fix to cease. -SET DEBUG='+d,row_upd_extern_checkpoint'; +SET DEBUG_DBUG='+d,row_upd_extern_checkpoint'; SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR crash'; # This should move column b off-page. --send @@ -174,7 +174,7 @@ connection default; # remain open while we are writing the off-page columns and are # stuck in the DEBUG_SYNC. A checkpoint involves a flush, which # would wait for the buffer-fix to cease. -SET DEBUG='+d,row_upd_extern_checkpoint'; +SET DEBUG_DBUG='+d,row_upd_extern_checkpoint'; SET DEBUG_SYNC='after_row_upd_extern SIGNAL have_latch WAIT_FOR crash'; # This should move column b off-page. --send diff --git a/mysql-test/suite/innodb/t/innodb-index-debug.test b/mysql-test/suite/innodb/t/innodb-index-debug.test index f03ef061769..ae880274e02 100644 --- a/mysql-test/suite/innodb/t/innodb-index-debug.test +++ b/mysql-test/suite/innodb/t/innodb-index-debug.test @@ -102,7 +102,7 @@ SIGNAL opened WAIT_FOR flushed'; send ALTER TABLE t1 FORCE, ADD COLUMN k4 int; connection default; SET DEBUG_SYNC= 'now WAIT_FOR opened'; -SET debug = '+d,row_log_tmpfile_fail'; +SET debug_dbug = '+d,row_log_tmpfile_fail'; INSERT INTO t1 select NULL,'aaa','bbb' from t480; INSERT INTO t1 select NULL,'aaaa','bbbb' from t480; SET DEBUG_SYNC= 'now SIGNAL flushed'; diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test index 5f0562e11ed..b8b52b8e3a5 100644 --- a/mysql-test/suite/innodb/t/innodb-table-online.test +++ b/mysql-test/suite/innodb/t/innodb-table-online.test @@ -46,11 +46,11 @@ SET @saved_debug_dbug = @@SESSION.debug_dbug; SET DEBUG_DBUG = '+d,innodb_OOM_prepare_inplace_alter'; --error ER_OUT_OF_RESOURCES ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; -SET SESSION DEBUG = @saved_debug_dbug; -SET SESSION DEBUG = '+d,innodb_OOM_inplace_alter'; +SET SESSION DEBUG_DBUG = @saved_debug_dbug; +SET SESSION DEBUG_DBUG = '+d,innodb_OOM_inplace_alter'; --error ER_OUT_OF_RESOURCES ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; -SET SESSION DEBUG = @saved_debug_dbug; +SET SESSION DEBUG_DBUG = @saved_debug_dbug; ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; connection default; diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test index 261b024fa41..ea186965e5f 100644 --- a/mysql-test/suite/innodb/t/log_file_size.test +++ b/mysql-test/suite/innodb/t/log_file_size.test @@ -107,7 +107,7 @@ SELECT * FROM t1; let SEARCH_PATTERN= syntax error in innodb_log_group_home_dir; --source include/search_pattern_in_file.inc ---let $restart_parameters= --debug=d,innodb_log_abort_1 +--let $restart_parameters= --debug-dbug=d,innodb_log_abort_1 --source include/restart_mysqld.inc --error ER_UNKNOWN_STORAGE_ENGINE SELECT * FROM t1; @@ -122,7 +122,7 @@ SELECT * FROM t1; let SEARCH_PATTERN= InnoDB: innodb_read_only prevents crash recovery; --source include/search_pattern_in_file.inc ---let $restart_parameters= --debug=d,innodb_log_abort_5 +--let $restart_parameters= --debug-dbug=d,innodb_log_abort_5 --source include/restart_mysqld.inc --error ER_UNKNOWN_STORAGE_ENGINE SELECT * FROM t1; diff --git a/mysql-test/suite/innodb/t/page_reorganize.test b/mysql-test/suite/innodb/t/page_reorganize.test index c4e0160cb6d..f90da5c5d0e 100644 --- a/mysql-test/suite/innodb/t/page_reorganize.test +++ b/mysql-test/suite/innodb/t/page_reorganize.test @@ -43,7 +43,7 @@ let $wait_condition= SET @save_dbug = @@debug_dbug; SET DEBUG_DBUG = '+d,do_page_reorganize,do_lock_reverse_page_reorganize'; insert into t1(f2) values (repeat('+', 100)); -SET DEBUG = @save_dbug; +SET DEBUG_DBUG = @save_dbug; commit; connection con1; diff --git a/mysql-test/suite/innodb_fts/r/ft_result_cache_limit.result b/mysql-test/suite/innodb_fts/r/ft_result_cache_limit.result index 2dbdd5a04bc..a42b08aea97 100644 --- a/mysql-test/suite/innodb_fts/r/ft_result_cache_limit.result +++ b/mysql-test/suite/innodb_fts/r/ft_result_cache_limit.result @@ -19,9 +19,7 @@ END WHILE; END// CALL populate_t1; SET autocommit=1; -SET SESSION debug="+d,fts_instrument_result_cache_limit"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET SESSION debug_dbug="+d,fts_instrument_result_cache_limit"; ALTER TABLE t1 ADD FULLTEXT INDEX `text_content_idx` (`text_content`); SELECT FTS_DOC_ID, text_content FROM t1 diff --git a/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test b/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test index 84254a182d7..bf20c939f38 100644 --- a/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test +++ b/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test @@ -32,7 +32,7 @@ DELIMITER ;// CALL populate_t1; SET autocommit=1; -SET SESSION debug="+d,fts_instrument_result_cache_limit"; +SET SESSION debug_dbug="+d,fts_instrument_result_cache_limit"; ALTER TABLE t1 ADD FULLTEXT INDEX `text_content_idx` (`text_content`); diff --git a/mysql-test/suite/innodb_gis/r/check_rtree.result b/mysql-test/suite/innodb_gis/r/check_rtree.result index fe60a628fde..10155fb5dd0 100644 --- a/mysql-test/suite/innodb_gis/r/check_rtree.result +++ b/mysql-test/suite/innodb_gis/r/check_rtree.result @@ -1,7 +1,5 @@ create table t1 (i int, g geometry not null, spatial index (g))engine=innodb; -SET SESSION debug="+d,rtree_test_check_count"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET SESSION debug_dbug="+d,rtree_test_check_count"; insert into t1 values (1, POINT(1,1)); insert into t1 values (1, POINT(1.5,1.5)); insert into t1 values (1, POINT(3,3)); diff --git a/mysql-test/suite/innodb_gis/r/rollback.result b/mysql-test/suite/innodb_gis/r/rollback.result index 0d2b9c7cf2c..1f10dc00de5 100644 --- a/mysql-test/suite/innodb_gis/r/rollback.result +++ b/mysql-test/suite/innodb_gis/r/rollback.result @@ -407,9 +407,7 @@ start transaction; update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3; ERROR 23000: Duplicate entry '5' for key 'c' rollback; -set session debug="+d,row_mysql_crash_if_error"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +set session debug_dbug="+d,row_mysql_crash_if_error"; update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3; ERROR HY000: Lost connection to server during query insert into t1 values(5, point(5,5), point(5,5), 5); diff --git a/mysql-test/suite/innodb_gis/r/rtree_compress.result b/mysql-test/suite/innodb_gis/r/rtree_compress.result index a88f8b9fa9b..442e6d68155 100644 --- a/mysql-test/suite/innodb_gis/r/rtree_compress.result +++ b/mysql-test/suite/innodb_gis/r/rtree_compress.result @@ -41,9 +41,7 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1); count(*) 0 SET @saved_dbug = @@SESSION.debug_dbug; -SET DEBUG='+d,page_copy_rec_list_start_compress_fail'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET DEBUG_DBUG='+d,page_copy_rec_list_start_compress_fail'; delete from t1; select count(*) from t1 where MBRWithin(t1.c2, @g1); count(*) diff --git a/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result b/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result index a8898f5c98f..a49cba3a236 100644 --- a/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result +++ b/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result @@ -30,8 +30,6 @@ SELECT COUNT(*) FROM t1 WHERE MBRWithin(t1.c2, @g1); COUNT(*) 0 ALTER TABLE t1 DROP INDEX idx, ADD SPATIAL INDEX idx3(c2); -SET SESSION debug="+d,row_merge_instrument_log_check_flush"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET SESSION debug_dbug="+d,row_merge_instrument_log_check_flush"; ALTER TABLE t1 DROP INDEX idx3, ADD SPATIAL INDEX idx4(c2), ADD SPATIAL INDEX idx5(c3); DROP TABLE t1; diff --git a/mysql-test/suite/innodb_gis/t/check_rtree.test b/mysql-test/suite/innodb_gis/t/check_rtree.test index 09bba50d191..a52c6d0b2a2 100644 --- a/mysql-test/suite/innodb_gis/t/check_rtree.test +++ b/mysql-test/suite/innodb_gis/t/check_rtree.test @@ -9,7 +9,7 @@ create table t1 (i int, g geometry not null, spatial index (g))engine=innodb; # Turn on the geometry data print. -SET SESSION debug="+d,rtree_test_check_count"; +SET SESSION debug_dbug="+d,rtree_test_check_count"; # Insert values. insert into t1 values (1, POINT(1,1)); diff --git a/mysql-test/suite/innodb_gis/t/rollback.test b/mysql-test/suite/innodb_gis/t/rollback.test index fcfe71e2f80..ec6da015c16 100644 --- a/mysql-test/suite/innodb_gis/t/rollback.test +++ b/mysql-test/suite/innodb_gis/t/rollback.test @@ -464,7 +464,7 @@ rollback; # Test partial update rollback after recovered. # Crash the server in partial update. --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -set session debug="+d,row_mysql_crash_if_error"; +set session debug_dbug="+d,row_mysql_crash_if_error"; --error 2013 update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3; diff --git a/mysql-test/suite/innodb_gis/t/rtree_compress.test b/mysql-test/suite/innodb_gis/t/rtree_compress.test index a3d1e883a45..94bdf6c6dbe 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_compress.test +++ b/mysql-test/suite/innodb_gis/t/rtree_compress.test @@ -52,7 +52,7 @@ set @g1 = ST_GeomFromText('Polygon((10 10,10 800,800 800,800 10,10 10))'); select count(*) from t1 where MBRWithin(t1.c2, @g1); SET @saved_dbug = @@SESSION.debug_dbug; -SET DEBUG='+d,page_copy_rec_list_start_compress_fail'; +SET DEBUG_DBUG='+d,page_copy_rec_list_start_compress_fail'; delete from t1; select count(*) from t1 where MBRWithin(t1.c2, @g1); SET debug_dbug = @saved_dbug; diff --git a/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test b/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test index ef3f017197a..d32093b124a 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test +++ b/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test @@ -42,7 +42,7 @@ SELECT COUNT(*) FROM t1 WHERE MBRWithin(t1.c2, @g1); ALTER TABLE t1 DROP INDEX idx, ADD SPATIAL INDEX idx3(c2); -SET SESSION debug="+d,row_merge_instrument_log_check_flush"; +SET SESSION debug_dbug="+d,row_merge_instrument_log_check_flush"; ALTER TABLE t1 DROP INDEX idx3, ADD SPATIAL INDEX idx4(c2), ADD SPATIAL INDEX idx5(c3); # Clean up. diff --git a/mysql-test/suite/mariabackup/undo_space_id.opt b/mysql-test/suite/mariabackup/undo_space_id.opt index 006e17a2535..cc31e3dc38e 100644 --- a/mysql-test/suite/mariabackup/undo_space_id.opt +++ b/mysql-test/suite/mariabackup/undo_space_id.opt @@ -1,3 +1,3 @@ ---debug=d,innodb_undo_upgrade,force_rebootstrap +--debug-dbug=d,innodb_undo_upgrade,force_rebootstrap --innodb_data_file_path=ib_mysql:10M --innodb_undo_tablespaces=2 diff --git a/mysql-test/suite/perfschema/include/hostcache_set_state.inc b/mysql-test/suite/perfschema/include/hostcache_set_state.inc index 29f321236bd..995a1028a4b 100644 --- a/mysql-test/suite/perfschema/include/hostcache_set_state.inc +++ b/mysql-test/suite/perfschema/include/hostcache_set_state.inc @@ -9,7 +9,7 @@ flush privileges; # Print critical setup -#select @@global.debug; +#select @@global.debug_dbug; #select @@global.max_connect_errors; #select @@global.max_user_connections; #select @@global.max_connections; diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index 388fac4b668..69e9319cefa 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -28,7 +28,7 @@ declare msg_detail varchar(512); declare cmd_1 varchar(512); declare cmd_2 varchar(512); declare done integer default 0; -declare debug integer default 0; +declare dbg integer default 0; declare pfs_cursor CURSOR FOR select table_name from information_schema.tables where table_schema= 'performance_schema' @@ -106,7 +106,7 @@ set count_expected = save_count_expected - count_global_expected; end if; select concat("Checking table ", pfs_table_name, " ...") as status; select concat(cmd_1, pfs_table_name, cmd_2) into @cmd; -if debug = 1 +if dbg = 1 then select @cmd; end if; diff --git a/mysql-test/suite/perfschema/t/ortho_iter.test b/mysql-test/suite/perfschema/t/ortho_iter.test index d577b6dba5b..531437158b1 100644 --- a/mysql-test/suite/perfschema/t/ortho_iter.test +++ b/mysql-test/suite/perfschema/t/ortho_iter.test @@ -55,7 +55,7 @@ begin declare cmd_1 varchar(512); declare cmd_2 varchar(512); declare done integer default 0; - declare debug integer default 0; + declare dbg integer default 0; declare pfs_cursor CURSOR FOR select table_name from information_schema.tables @@ -146,7 +146,7 @@ begin select concat("Checking table ", pfs_table_name, " ...") as status; select concat(cmd_1, pfs_table_name, cmd_2) into @cmd; - if debug = 1 + if dbg = 1 then select @cmd; end if; diff --git a/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test index 181759283e2..f87ea01f197 100644 --- a/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test +++ b/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test @@ -24,7 +24,7 @@ # # let $debug_sync_action= 'now signal signal_name'; # -# The $dbug_sync_point becomes the value of @@global.debug generating +# The $dbug_sync_point becomes the value of @@global.debug_dbug generating # a newly started IO-slave thread's session value. # Notice incremental operations to add and remove dbug_execute_if_name # from the global variable allows propagation more dbug arguments @@ -68,7 +68,7 @@ source include/wait_for_slave_io_error.inc; # deactivate the sync point of get_master_version_and_clock() # now to avoid restarting IO-thread to re-enter it. -# There will be a new IO thread forked out with its @@session.debug +# There will be a new IO thread forked out with its @@session.debug_dbug # unset. set @@global.debug_dbug= @old_dbug; diff --git a/mysql-test/suite/rpl/r/rpl_bug26395.result b/mysql-test/suite/rpl/r/rpl_bug26395.result index 7c54e7b2e54..9053c332700 100644 --- a/mysql-test/suite/rpl/r/rpl_bug26395.result +++ b/mysql-test/suite/rpl/r/rpl_bug26395.result @@ -8,7 +8,7 @@ Table Create Table tinnodb CREATE TABLE `tinnodb` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -set @old_debug= @@debug; +set @old_debug= @@debug_dbug; set @@debug_dbug= 'd,do_not_write_xid'; ==== Test ==== INSERT INTO tinnodb VALUES (1); diff --git a/mysql-test/suite/rpl/r/rpl_row_end_of_statement_loss.result b/mysql-test/suite/rpl/r/rpl_row_end_of_statement_loss.result index dc6a67b48d2..f34c41f9c9c 100644 --- a/mysql-test/suite/rpl/r/rpl_row_end_of_statement_loss.result +++ b/mysql-test/suite/rpl/r/rpl_row_end_of_statement_loss.result @@ -3,7 +3,7 @@ include/master-slave.inc connection slave; call mtr.add_suppression("Slave IO thread did not receive an expected Rows-log end-of-statement"); call mtr.add_suppression("Relay log write failure: could not queue event from master"); -SET @save_debug= @@global.debug; +SET @save_debug= @@global.debug_dbug; SET GLOBAL debug_dbug="+d,simulate_stmt_end_rows_event_loss"; include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, MASTER_USE_GTID=SLAVE_POS; diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_slave_reply_fail.result b/mysql-test/suite/rpl/r/rpl_semi_sync_slave_reply_fail.result index 6b39b296cdf..3a30381d7c4 100644 --- a/mysql-test/suite/rpl/r/rpl_semi_sync_slave_reply_fail.result +++ b/mysql-test/suite/rpl/r/rpl_semi_sync_slave_reply_fail.result @@ -10,7 +10,7 @@ create table t1 (i int); connection slave; set global rpl_semi_sync_slave_enabled = ON; CALL mtr.add_suppression("Semi-sync slave net_flush*"); -SET @save_debug= @@global.debug; +SET @save_debug= @@global.debug_dbug; SET GLOBAL debug_dbug="+d,semislave_failed_net_flush"; include/start_slave.inc connection master; diff --git a/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result b/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result index 36a2bac5838..f5e1c8d31b9 100644 --- a/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result +++ b/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result @@ -269,26 +269,20 @@ show status like 'Rpl_semi_sync_master_clients'; Variable_name Value Rpl_semi_sync_master_clients 1 # Test failure of select error . -SET GLOBAL debug = 'd,rpl_semisync_simulate_select_error'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug = 'd,rpl_semisync_simulate_select_error'; INSERT INTO t1 VALUES(3); connection slave; connection con1; # Test failure of pthread_create SET GLOBAL rpl_semi_sync_master_enabled = 0; -SET GLOBAL debug = 'd,rpl_semisync_simulate_create_thread_failure'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug = 'd,rpl_semisync_simulate_create_thread_failure'; SET GLOBAL rpl_semi_sync_master_enabled= ON; # Test failure of pthread_join SET GLOBAL rpl_semi_sync_master_enabled= OFF; # # Failure on registering semisync slave # -SET GLOBAL debug= 'd,rpl_semisync_simulate_add_slave_failure'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug= 'd,rpl_semisync_simulate_add_slave_failure'; SET GLOBAL rpl_semi_sync_master_enabled= ON; connection slave; STOP SLAVE IO_THREAD; @@ -296,9 +290,7 @@ include/wait_for_slave_io_to_stop.inc START SLAVE IO_THREAD; include/wait_for_slave_io_to_start.inc connection con1; -SET GLOBAL debug=''; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug=''; connection slave; START SLAVE IO_THREAD; include/wait_for_slave_io_to_start.inc diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result b/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result index 2b53fde52a7..15c1ae00cb1 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result @@ -5,7 +5,7 @@ include/stop_slave.inc CHANGE MASTER TO MASTER_USE_GTID=NO; include/start_slave.inc connection slave; -SET @old_debug_slave= @@global.debug; +SET @old_debug_slave= @@global.debug_dbug; stop slave; SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; @@ -13,7 +13,7 @@ set global gtid_strict_mode=1; start slave; connection master; call mtr.add_suppression("ALTER query started at .+ could not be completed"); -SET @old_debug_master= @@global.debug; +SET @old_debug_master= @@global.debug_dbug; set binlog_alter_two_phase=true; create table t3( a int primary key, b int) engine=innodb; connection master; diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result b/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result index 0a1c1f7971e..a0a368399fb 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result @@ -1,7 +1,7 @@ include/master-slave.inc [connection master] connection slave; -SET @old_debug_slave= @@global.debug; +SET @old_debug_slave= @@global.debug_dbug; include/stop_slave.inc SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; @@ -9,7 +9,7 @@ set global gtid_strict_mode=1; set global debug_dbug="+d,rpl_slave_stop_CA_before_binlog"; include/start_slave.inc connection master; -SET @old_debug_master= @@global.debug; +SET @old_debug_master= @@global.debug_dbug; set global debug_dbug="+d,start_alter_delay_master"; set global binlog_alter_two_phase=true; create table t1( a int primary key, b int) engine=myisam; diff --git a/mysql-test/suite/rpl/t/rpl_bug26395.test b/mysql-test/suite/rpl/t/rpl_bug26395.test index 0c1b2a7a0ac..5054b106b1b 100644 --- a/mysql-test/suite/rpl/t/rpl_bug26395.test +++ b/mysql-test/suite/rpl/t/rpl_bug26395.test @@ -30,7 +30,7 @@ # BUG#26395: if crash during autocommit update to transactional table on master, slave fails source include/have_innodb.inc; -# have_debug is needed since we use the @@debug variable on master +# have_debug is needed since we use the @@debug_dbug variable on master source include/have_debug.inc; source include/master-slave.inc; @@ -43,7 +43,7 @@ CREATE TABLE tinnodb (a INT) ENGINE = INNODB; SHOW CREATE TABLE tinnodb; # do_not_write_xid stops the master from writing an XID event. -set @old_debug= @@debug; +set @old_debug= @@debug_dbug; set @@debug_dbug= 'd,do_not_write_xid'; diff --git a/mysql-test/suite/rpl/t/rpl_corruption.test b/mysql-test/suite/rpl/t/rpl_corruption.test index cd2a1cc7ef2..16270fa4adc 100644 --- a/mysql-test/suite/rpl/t/rpl_corruption.test +++ b/mysql-test/suite/rpl/t/rpl_corruption.test @@ -14,10 +14,10 @@ ############################################################ # -# The tests intensively utilize @@global.debug. Note, +# The tests intensively utilize @@global.debug_dbug. Note, # Bug#11765758 - 58754, -# @@global.debug is read by the slave threads through dbug-interface. -# Hence, before a client thread set @@global.debug we have to ensure that: +# @@global.debug_dbug is read by the slave threads through dbug-interface. +# Hence, before a client thread set @@global.debug_dbug we have to ensure that: # (a) the slave threads are stopped, or (b) the slave threads are in # sync and waiting. diff --git a/mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt b/mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt index d4ba386a1a0..5cbc1f9d365 100644 --- a/mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt +++ b/mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt @@ -1 +1 @@ ---loose-debug=d,pretend_version_50034_in_binlog +--loose-debug-dbug=d,pretend_version_50034_in_binlog diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt index 9c846c799f3..39a1271c62a 100644 --- a/mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt @@ -1 +1 @@ ---loose-debug=+d,LOAD_DATA_INFILE_has_fatal_error +--loose-debug-dbug=+d,LOAD_DATA_INFILE_has_fatal_error diff --git a/mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt b/mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt index 3073fa4f5d7..b3f3d539d8d 100644 --- a/mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt +++ b/mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt @@ -1,2 +1,2 @@ ---loose-debug=d,"old_row_based_repl_4_byte_map_id_master" +--loose-debug-dbug=d,"old_row_based_repl_4_byte_map_id_master" --log-bin-use-v1-row-events=1 diff --git a/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss.test b/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss.test index 5b2d99f3bf1..97bbc84f519 100644 --- a/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss.test +++ b/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss.test @@ -7,7 +7,7 @@ call mtr.add_suppression("Slave IO thread did not receive an expected Rows-log end-of-statement"); call mtr.add_suppression("Relay log write failure: could not queue event from master"); -SET @save_debug= @@global.debug; +SET @save_debug= @@global.debug_dbug; SET GLOBAL debug_dbug="+d,simulate_stmt_end_rows_event_loss"; --source include/stop_slave.inc --replace_result $MASTER_MYPORT MASTER_PORT diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_slave_reply_fail.test b/mysql-test/suite/rpl/t/rpl_semi_sync_slave_reply_fail.test index f0eb474f00e..384a357c96f 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync_slave_reply_fail.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync_slave_reply_fail.test @@ -39,7 +39,7 @@ create table t1 (i int); --connection slave set global rpl_semi_sync_slave_enabled = ON; CALL mtr.add_suppression("Semi-sync slave net_flush*"); -SET @save_debug= @@global.debug; +SET @save_debug= @@global.debug_dbug; SET GLOBAL debug_dbug="+d,semislave_failed_net_flush"; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test index 5e6f350b191..1337eca3422 100644 --- a/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test +++ b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test @@ -285,7 +285,7 @@ INSERT INTO t1 VALUES (2); show status like 'Rpl_semi_sync_master_clients'; --echo # Test failure of select error . -SET GLOBAL debug = 'd,rpl_semisync_simulate_select_error'; +SET GLOBAL debug_dbug = 'd,rpl_semisync_simulate_select_error'; # It can still receive ACK from semi-sync slave INSERT INTO t1 VALUES(3); sync_slave_with_master; @@ -293,7 +293,7 @@ sync_slave_with_master; connection con1; --echo # Test failure of pthread_create SET GLOBAL rpl_semi_sync_master_enabled = 0; -SET GLOBAL debug = 'd,rpl_semisync_simulate_create_thread_failure'; +SET GLOBAL debug_dbug = 'd,rpl_semisync_simulate_create_thread_failure'; SET GLOBAL rpl_semi_sync_master_enabled= ON; --let $wait_condition= SELECT @@global.rpl_semi_sync_master_enabled = 0 @@ -301,7 +301,7 @@ SET GLOBAL rpl_semi_sync_master_enabled= ON; # Todo: implement the thread join failure simulation --echo # Test failure of pthread_join -#SET GLOBAL DEBUG = 'd,rpl_semisync_simulate_thread_join_failure'; +#SET GLOBAL DEBUG_DBUG = 'd,rpl_semisync_simulate_thread_join_failure'; #SET GLOBAL rpl_semi_sync_master_enabled= ON; # #--let $wait_condition= SELECT @@global.rpl_semi_sync_master_enabled = 0 @@ -311,7 +311,7 @@ SET GLOBAL rpl_semi_sync_master_enabled= OFF; --echo # --echo # Failure on registering semisync slave --echo # -SET GLOBAL debug= 'd,rpl_semisync_simulate_add_slave_failure'; +SET GLOBAL debug_dbug= 'd,rpl_semisync_simulate_add_slave_failure'; SET GLOBAL rpl_semi_sync_master_enabled= ON; connection slave; @@ -325,7 +325,7 @@ connection con1; # Todo: implement the add_slave_failure simulation. Meanwhile # the status will be 1. # show status like 'Rpl_semi_sync_master_clients'; -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; --let $status_var= Rpl_semi_sync_master_clients --let $status_var_value= 1 diff --git a/mysql-test/suite/rpl/t/rpl_skip_incident-master.opt b/mysql-test/suite/rpl/t/rpl_skip_incident-master.opt index 912801debc4..4e746bf178f 100644 --- a/mysql-test/suite/rpl/t/rpl_skip_incident-master.opt +++ b/mysql-test/suite/rpl/t/rpl_skip_incident-master.opt @@ -1 +1 @@ ---loose-debug=+d,incident_database_resync_on_replace +--loose-debug-dbug=+d,incident_database_resync_on_replace diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test b/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test index aac3af6fc14..959af0efd12 100644 --- a/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test +++ b/mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test @@ -15,7 +15,7 @@ CHANGE MASTER TO MASTER_USE_GTID=NO; --source include/start_slave.inc --connection slave -SET @old_debug_slave= @@global.debug; +SET @old_debug_slave= @@global.debug_dbug; stop slave; --let $gtid_strict_mode= `select @@gtid_strict_mode` --let $slave_parallel_threads= `select @@slave_parallel_threads` @@ -28,7 +28,7 @@ start slave; --connection master call mtr.add_suppression("ALTER query started at .+ could not be completed"); -SET @old_debug_master= @@global.debug; +SET @old_debug_master= @@global.debug_dbug; --let $binlog_alter_two_phase= `select @@binlog_alter_two_phase` set binlog_alter_two_phase=true; create table t3( a int primary key, b int) engine=innodb; diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test b/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test index df028ff1820..319e8223929 100644 --- a/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test +++ b/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test @@ -10,7 +10,7 @@ --source include/have_debug.inc --connection slave -SET @old_debug_slave= @@global.debug; +SET @old_debug_slave= @@global.debug_dbug; --source include/stop_slave.inc --let $gtid_strict_mode= `select @@gtid_strict_mode` --let $slave_parallel_threads= `select @@slave_parallel_threads` @@ -25,7 +25,7 @@ set global debug_dbug="+d,rpl_slave_stop_CA_before_binlog"; # # SLAVE Shutdown --connection master -SET @old_debug_master= @@global.debug; +SET @old_debug_master= @@global.debug_dbug; set global debug_dbug="+d,start_alter_delay_master"; --let $binlog_alter_two_phase= `select @@binlog_alter_two_phase` set global binlog_alter_two_phase=true; diff --git a/mysql-test/suite/storage_engine/type_char_indexes.result b/mysql-test/suite/storage_engine/type_char_indexes.result index 73c076863ab..a72d0de514e 100644 --- a/mysql-test/suite/storage_engine/type_char_indexes.result +++ b/mysql-test/suite/storage_engine/type_char_indexes.result @@ -95,17 +95,6 @@ v128 COUNT(*) varchar1b 2 varchar2b 1 varchar3b 1 -SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; -Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release -EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; -id select_type table type possible_keys key key_len ref rows Extra -# # # range c_v c_v # # # Using index condition -SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; -c c20 v16 v128 -b char3 varchar1a varchar1b -c char4 varchar3a varchar3b -SET SESSION optimizer_switch = @@global.optimizer_switch; DROP TABLE t1; CREATE TABLE t1 (c CHAR , c20 CHAR(20) , diff --git a/mysql-test/suite/storage_engine/type_char_indexes.test b/mysql-test/suite/storage_engine/type_char_indexes.test index 6fff8a6f73e..c44e9a8a217 100644 --- a/mysql-test/suite/storage_engine/type_char_indexes.test +++ b/mysql-test/suite/storage_engine/type_char_indexes.test @@ -133,13 +133,6 @@ if (!$mysql_errname) --sorted_result SELECT v128, COUNT(*) FROM t1 USE INDEX FOR GROUP BY (c_v) GROUP BY v128; - SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; - --replace_column 1 # 2 # 3 # 7 # 8 # 9 # - EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; - --sorted_result - SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; - SET SESSION optimizer_switch = @@global.optimizer_switch; - DROP TABLE t1; } diff --git a/mysql-test/suite/sys_vars/r/date_format_basic.result b/mysql-test/suite/sys_vars/r/date_format_basic.result deleted file mode 100644 index a92d275dbba..00000000000 --- a/mysql-test/suite/sys_vars/r/date_format_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.date_format; -@@global.date_format -%Y-%m-%d -select @@session.date_format; -ERROR HY000: Variable 'date_format' is a GLOBAL variable -show global variables like 'date_format'; -Variable_name Value -date_format %Y-%m-%d -show session variables like 'date_format'; -Variable_name Value -date_format %Y-%m-%d -select * from information_schema.global_variables where variable_name='date_format'; -VARIABLE_NAME VARIABLE_VALUE -DATE_FORMAT %Y-%m-%d -select * from information_schema.session_variables where variable_name='date_format'; -VARIABLE_NAME VARIABLE_VALUE -DATE_FORMAT %Y-%m-%d -set global date_format="foo"; -ERROR HY000: Variable 'date_format' is a read only variable -set session date_format="foo"; -ERROR HY000: Variable 'date_format' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/datetime_format_basic.result b/mysql-test/suite/sys_vars/r/datetime_format_basic.result deleted file mode 100644 index ac80ee37590..00000000000 --- a/mysql-test/suite/sys_vars/r/datetime_format_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.datetime_format; -@@global.datetime_format -%Y-%m-%d %H:%i:%s -select @@session.datetime_format; -ERROR HY000: Variable 'datetime_format' is a GLOBAL variable -show global variables like 'datetime_format'; -Variable_name Value -datetime_format %Y-%m-%d %H:%i:%s -show session variables like 'datetime_format'; -Variable_name Value -datetime_format %Y-%m-%d %H:%i:%s -select * from information_schema.global_variables where variable_name='datetime_format'; -VARIABLE_NAME VARIABLE_VALUE -DATETIME_FORMAT %Y-%m-%d %H:%i:%s -select * from information_schema.session_variables where variable_name='datetime_format'; -VARIABLE_NAME VARIABLE_VALUE -DATETIME_FORMAT %Y-%m-%d %H:%i:%s -set global datetime_format="foo"; -ERROR HY000: Variable 'datetime_format' is a read only variable -set session datetime_format="foo"; -ERROR HY000: Variable 'datetime_format' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/debug_basic.result b/mysql-test/suite/sys_vars/r/debug_basic.result deleted file mode 100644 index a97ad65b40f..00000000000 --- a/mysql-test/suite/sys_vars/r/debug_basic.result +++ /dev/null @@ -1,27 +0,0 @@ -set session debug="L"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead -select @@global.debug="1"; -@@global.debug="1" -0 -select @@session.debug; -@@session.debug -L -show global variables like 'debug'; -Variable_name Value -debug # -show session variables like 'debug'; -Variable_name Value -debug L -select * from information_schema.global_variables where variable_name="debug"; -VARIABLE_NAME VARIABLE_VALUE -DEBUG # -select * from information_schema.session_variables where variable_name="debug"; -VARIABLE_NAME VARIABLE_VALUE -DEBUG L -set @@global.debug=1; -ERROR 42000: Incorrect argument type to variable 'debug' -set @@global.debug=1.1; -ERROR 42000: Incorrect argument type to variable 'debug' -set @@global.debug=1e1; -ERROR 42000: Incorrect argument type to variable 'debug' diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_basic.result b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result index ad2fbc5a738..091f8ed3b88 100644 --- a/mysql-test/suite/sys_vars/r/debug_dbug_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result @@ -2,21 +2,21 @@ set session debug_dbug="L"; select @@global.debug_dbug="1"; @@global.debug_dbug="1" 0 -select @@session.debug; -@@session.debug +select @@session.debug_dbug; +@@session.debug_dbug L -show global variables like 'debug'; +show global variables like 'debug_dbug'; Variable_name Value -debug # -show session variables like 'debug'; +debug_dbug # +show session variables like 'debug_dbug'; Variable_name Value -debug L -select * from information_schema.global_variables where variable_name="debug"; +debug_dbug L +select * from information_schema.global_variables where variable_name='debug_dbug'; VARIABLE_NAME VARIABLE_VALUE -DEBUG # -select * from information_schema.session_variables where variable_name="debug"; +DEBUG_DBUG # +select * from information_schema.session_variables where variable_name='debug_dbug'; VARIABLE_NAME VARIABLE_VALUE -DEBUG L +DEBUG_DBUG L set @@global.debug_dbug=1; ERROR 42000: Incorrect argument type to variable 'debug_dbug' set @@global.debug_dbug=1.1; diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result b/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result index 45de298e25b..7f8c0709ec6 100644 --- a/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result +++ b/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result @@ -2,23 +2,23 @@ connect con1,localhost,root,,test,,; connect con2,localhost,root,,test,,; connection con1; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug t +debug_dbug t connection con2; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug t +debug_dbug t connection con1; set session debug_dbug="d:t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug d:t +debug_dbug d:t connection con2; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug t +debug_dbug t disconnect con1; disconnect con2; connection default; diff --git a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result index 16216227aa8..2cd5fa81898 100644 --- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result +++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result @@ -456,12 +456,6 @@ SET @@session.lc_time_names=sq_AL; SELECT @@session.lc_time_names; @@session.lc_time_names sq_AL -SET @@session.lc_time_names=sr_YU; -Warnings: -Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead -SELECT @@session.lc_time_names; -@@session.lc_time_names -sr_RS SET @@session.lc_time_names=sv_FI; SELECT @@session.lc_time_names; @@session.lc_time_names @@ -903,12 +897,6 @@ SET @@global.lc_time_names=sq_AL; SELECT @@global.lc_time_names; @@global.lc_time_names sq_AL -SET @@global.lc_time_names=sr_YU; -Warnings: -Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead -SELECT @@global.lc_time_names; -@@global.lc_time_names -sr_RS SET @@global.lc_time_names=sv_FI; SELECT @@global.lc_time_names; @@global.lc_time_names @@ -1046,6 +1034,8 @@ SET @@lc_time_names = 'en US'; ERROR HY000: Unknown locale: 'en US' SET @@lc_time_names = 'enUS'; ERROR HY000: Unknown locale: 'enUS' +SET @@session.lc_time_names=sr_YU; +ERROR HY000: Unknown locale: 'sr_YU' SET @@lc_time_names = true; SELECT @@lc_time_names AS res_with_true; res_with_true diff --git a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result deleted file mode 100644 index dd00d1a0a23..00000000000 --- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result +++ /dev/null @@ -1,251 +0,0 @@ -SET @start_global_value = @@global.max_tmp_tables; -SELECT @start_global_value; -@start_global_value -32 -SET @start_session_value = @@session.max_tmp_tables; -SELECT @start_session_value; -@start_session_value -32 -'#--------------------FN_DYNVARS_086_01-------------------------#' -SET @@global.max_tmp_tables = 1000; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SET @@global.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -32 -SET @@session.max_tmp_tables = 1000; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SET @@session.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -32 -'#--------------------FN_DYNVARS_086_02-------------------------#' -SET @@global.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables = 32; -@@global.max_tmp_tables = 32 -1 -SET @@session.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables = 32; -@@session.max_tmp_tables = 32 -1 -'#--------------------FN_DYNVARS_086_03-------------------------#' -SET @@global.max_tmp_tables = 1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = 2; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -2 -SET @@global.max_tmp_tables = 65536; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -65536 -SET @@global.max_tmp_tables = 4294967295; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = 4294967294; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967294 -'#--------------------FN_DYNVARS_086_04-------------------------#' -SET @@session.max_tmp_tables = 1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -1 -SET @@session.max_tmp_tables = 2; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -2 -SET @@session.max_tmp_tables = 65536; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -65536 -SET @@session.max_tmp_tables = 4294967295; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = 4294967294; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967294 -'#------------------FN_DYNVARS_086_05-----------------------#' -SET @@global.max_tmp_tables = -1024; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1024' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = 4294967296; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = -1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = 429496729500; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = 65530.34; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = test; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = 4294967296; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = -1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -1 -SET @@session.max_tmp_tables = 429496729500; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = -001; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -1 -SET @@session.max_tmp_tables = 65530.34; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SET @@session.max_tmp_tables = 10737418241; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '10737418241' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = test; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -'#------------------FN_DYNVARS_086_06-----------------------#' -SELECT @@global.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; -@@global.max_tmp_tables = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_086_07-----------------------#' -SELECT @@session.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; -@@session.max_tmp_tables = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_086_08-----------------------#' -SET @@global.max_tmp_tables = TRUE; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = FALSE; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '0' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -'#---------------------FN_DYNVARS_086_09----------------------#' -SET @@global.max_tmp_tables = 20; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@max_tmp_tables = @@global.max_tmp_tables; -@@max_tmp_tables = @@global.max_tmp_tables -0 -'#---------------------FN_DYNVARS_086_10----------------------#' -SET @@max_tmp_tables = 255; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@max_tmp_tables = @@local.max_tmp_tables; -@@max_tmp_tables = @@local.max_tmp_tables -1 -SELECT @@local.max_tmp_tables = @@session.max_tmp_tables; -@@local.max_tmp_tables = @@session.max_tmp_tables -1 -'#---------------------FN_DYNVARS_086_11----------------------#' -SET max_tmp_tables = 102; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@max_tmp_tables; -@@max_tmp_tables -102 -SELECT local.max_tmp_tables; -ERROR 42S02: Unknown table 'local' in field list -SELECT session.max_tmp_tables; -ERROR 42S02: Unknown table 'session' in field list -SELECT max_tmp_tables = @@session.max_tmp_tables; -ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list' -SET @@global.max_tmp_tables = @start_global_value; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -32 -SET @@session.max_tmp_tables = @start_session_value; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -32 diff --git a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result index 5593fc2ed50..54a9b6dde7b 100644 --- a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result +++ b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result @@ -1,60 +1,58 @@ set @@global.optimizer_switch=@@optimizer_switch; select @@global.optimizer_switch; @@global.optimizer_switch -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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on select @@session.optimizer_switch; @@session.optimizer_switch -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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on show global variables like 'optimizer_switch'; Variable_name Value -optimizer_switch 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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on show session variables like 'optimizer_switch'; Variable_name Value -optimizer_switch 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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on select * from information_schema.global_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH 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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +OPTIMIZER_SWITCH index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on select * from information_schema.session_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH 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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on -set global optimizer_switch=4101; -set session optimizer_switch=2058; +OPTIMIZER_SWITCH index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,sargable_casefold=on +set global optimizer_switch=2053; +set session optimizer_switch=1034; select @@global.optimizer_switch; @@global.optimizer_switch -index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off select @@session.optimizer_switch; @@session.optimizer_switch -index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off set global optimizer_switch="index_merge_sort_union=on"; set session optimizer_switch="index_merge=off"; select @@global.optimizer_switch; @@global.optimizer_switch -index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off select @@session.optimizer_switch; @@session.optimizer_switch -index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off show global variables like 'optimizer_switch'; Variable_name Value -optimizer_switch index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +optimizer_switch index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off show session variables like 'optimizer_switch'; Variable_name Value -optimizer_switch index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +optimizer_switch index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off select * from information_schema.global_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +OPTIMIZER_SWITCH index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off select * from information_schema.session_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +OPTIMIZER_SWITCH index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off set session optimizer_switch="default"; select @@session.optimizer_switch; @@session.optimizer_switch -index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off +index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,sargable_casefold=off set optimizer_switch = replace(@@optimizer_switch, '=off', '=on'); -Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=on,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=on,mrr_cost_based=on,mrr_sort_keys=on,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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=on,hash_join_cardinality=on,sargable_casefold=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=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=on,mrr_cost_based=on,mrr_sort_keys=on,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=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=on,hash_join_cardinality=on,sargable_casefold=on set global optimizer_switch=1.1; ERROR 42000: Incorrect argument type to variable 'optimizer_switch' set global optimizer_switch=1e1; diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug.result b/mysql-test/suite/sys_vars/r/sysvars_debug.result index fc04ac83210..e929d9000df 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_debug.result +++ b/mysql-test/suite/sys_vars/r/sysvars_debug.result @@ -1,21 +1,6 @@ select * from information_schema.system_variables where variable_name like 'debug%' order by variable_name; -VARIABLE_NAME DEBUG -SESSION_VALUE -GLOBAL_VALUE -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE -VARIABLE_SCOPE SESSION -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Built-in DBUG debugger -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -GLOBAL_VALUE_PATH NULL VARIABLE_NAME DEBUG_BINLOG_FSYNC_SLEEP SESSION_VALUE NULL GLOBAL_VALUE 314 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index cdcd3cd3549..0049a94df99 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -565,15 +565,6 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2054,7 +2054,7 @@ READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME MAX_TMP_TABLES - VARIABLE_SCOPE SESSION --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Unused, will be removed. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 4294967295 @@ -2074,7 +2074,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index aa02866af37..8288c271a7f 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -712,26 +712,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATETIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATETIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATE_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATE format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2062,16 +2042,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME MAX_TMP_TABLES -VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Unused, will be removed. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 4294967295 -NUMERIC_BLOCK_SIZE 1 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_USER_CONNECTIONS VARIABLE_SCOPE SESSION VARIABLE_TYPE INT @@ -2499,7 +2469,7 @@ VARIABLE_COMMENT Fine-tune the optimizer behavior NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,engine_condition_pushdown,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,sargable_casefold,default +ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,sargable_casefold,default READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE @@ -3832,16 +3802,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL -VARIABLE_NAME TIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The TIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TIME_ZONE VARIABLE_SCOPE SESSION VARIABLE_TYPE VARCHAR diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff index e51b3984281..91ccd909bcf 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff @@ -575,15 +575,6 @@ NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 @@ -2264,7 +2264,7 @@ READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME MAX_TMP_TABLES - VARIABLE_SCOPE SESSION --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Unused, will be removed. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 4294967295 -@@ -2284,7 +2284,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 70be71c1b00..1fb6b245ace 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -752,26 +752,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATETIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATETIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATE_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATE format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2262,16 +2242,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME MAX_TMP_TABLES -VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Unused, will be removed. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 4294967295 -NUMERIC_BLOCK_SIZE 1 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_USER_CONNECTIONS VARIABLE_SCOPE SESSION VARIABLE_TYPE INT @@ -2699,7 +2669,7 @@ VARIABLE_COMMENT Fine-tune the optimizer behavior NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,engine_condition_pushdown,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,sargable_casefold,default +ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,sargable_casefold,default READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE @@ -4672,16 +4642,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL -VARIABLE_NAME TIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The TIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TIME_ZONE VARIABLE_SCOPE SESSION VARIABLE_TYPE VARCHAR diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index 4ca95338e56..cbea1d71482 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -31,21 +31,6 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL GLOBAL_VALUE_PATH NULL -VARIABLE_NAME WSREP_CAUSAL_READS -SESSION_VALUE OFF -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE SESSION -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Setting this variable is equivalent to setting wsrep_sync_wait READ flag -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -GLOBAL_VALUE_PATH NULL VARIABLE_NAME WSREP_CERTIFICATION_RULES SESSION_VALUE NULL GLOBAL_VALUE strict diff --git a/mysql-test/suite/sys_vars/r/time_format_basic.result b/mysql-test/suite/sys_vars/r/time_format_basic.result deleted file mode 100644 index fcc23608d39..00000000000 --- a/mysql-test/suite/sys_vars/r/time_format_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.time_format; -@@global.time_format -%H:%i:%s -select @@session.time_format; -ERROR HY000: Variable 'time_format' is a GLOBAL variable -show global variables like 'time_format'; -Variable_name Value -time_format %H:%i:%s -show session variables like 'time_format'; -Variable_name Value -time_format %H:%i:%s -select * from information_schema.global_variables where variable_name='time_format'; -VARIABLE_NAME VARIABLE_VALUE -TIME_FORMAT %H:%i:%s -select * from information_schema.session_variables where variable_name='time_format'; -VARIABLE_NAME VARIABLE_VALUE -TIME_FORMAT %H:%i:%s -set global time_format=1; -ERROR HY000: Variable 'time_format' is a read only variable -set session time_format=1; -ERROR HY000: Variable 'time_format' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result b/mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result deleted file mode 100644 index b5f0c0730b9..00000000000 --- a/mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result +++ /dev/null @@ -1,64 +0,0 @@ -# -# wsrep_causal_reads -# -# save the initial values -SET @wsrep_causal_reads_global_saved = @@global.wsrep_causal_reads; -SET @wsrep_causal_reads_session_saved = @@session.wsrep_causal_reads; -# default -SELECT @@global.wsrep_causal_reads; -@@global.wsrep_causal_reads -0 -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -0 - -# scope and valid values -SET @@global.wsrep_causal_reads=OFF; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@global.wsrep_causal_reads; -@@global.wsrep_causal_reads -0 -SET @@global.wsrep_causal_reads=ON; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@global.wsrep_causal_reads; -@@global.wsrep_causal_reads -1 -SET @@session.wsrep_causal_reads=OFF; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -0 -SET @@session.wsrep_causal_reads=ON; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -1 -SET @@session.wsrep_causal_reads=default; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -1 - -# invalid values -SET @@global.wsrep_causal_reads=NULL; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'NULL' -SET @@global.wsrep_causal_reads='junk'; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'junk' -SET @@session.wsrep_causal_reads=NULL; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'NULL' -SET @@session.wsrep_causal_reads='junk'; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'junk' - -# restore the initial values -SET @@global.wsrep_causal_reads = @wsrep_causal_reads_global_saved; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SET @@session.wsrep_causal_reads = @wsrep_causal_reads_session_saved; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -# End of test diff --git a/mysql-test/suite/sys_vars/t/date_format_basic.test b/mysql-test/suite/sys_vars/t/date_format_basic.test deleted file mode 100644 index a69295b405d..00000000000 --- a/mysql-test/suite/sys_vars/t/date_format_basic.test +++ /dev/null @@ -1,18 +0,0 @@ -# -# show the global and session values; -# -select @@global.date_format; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.date_format; -show global variables like 'date_format'; -show session variables like 'date_format'; -select * from information_schema.global_variables where variable_name='date_format'; -select * from information_schema.session_variables where variable_name='date_format'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global date_format="foo"; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session date_format="foo"; diff --git a/mysql-test/suite/sys_vars/t/datetime_format_basic.test b/mysql-test/suite/sys_vars/t/datetime_format_basic.test deleted file mode 100644 index 553d3126328..00000000000 --- a/mysql-test/suite/sys_vars/t/datetime_format_basic.test +++ /dev/null @@ -1,18 +0,0 @@ -# -# show the global and session values; -# -select @@global.datetime_format; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.datetime_format; -show global variables like 'datetime_format'; -show session variables like 'datetime_format'; -select * from information_schema.global_variables where variable_name='datetime_format'; -select * from information_schema.session_variables where variable_name='datetime_format'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global datetime_format="foo"; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session datetime_format="foo"; diff --git a/mysql-test/suite/sys_vars/t/debug_basic.test b/mysql-test/suite/sys_vars/t/debug_basic.test deleted file mode 100644 index b54626c38ca..00000000000 --- a/mysql-test/suite/sys_vars/t/debug_basic.test +++ /dev/null @@ -1,22 +0,0 @@ ---source include/have_debug.inc -# -# exists both as global and session -# -set session debug="L"; - -select @@global.debug="1"; # just to show that global.debug exists -select @@session.debug; # here we know the value and can display it ---replace_column 2 # -show global variables like 'debug'; -show session variables like 'debug'; ---replace_column 2 # -select * from information_schema.global_variables where variable_name="debug"; -select * from information_schema.session_variables where variable_name="debug"; - ---error ER_WRONG_TYPE_FOR_VAR -set @@global.debug=1; ---error ER_WRONG_TYPE_FOR_VAR -set @@global.debug=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set @@global.debug=1e1; - diff --git a/mysql-test/suite/sys_vars/t/debug_dbug_basic.test b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test index 44471bf193d..fb597a678ef 100644 --- a/mysql-test/suite/sys_vars/t/debug_dbug_basic.test +++ b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test @@ -4,14 +4,14 @@ # set session debug_dbug="L"; -select @@global.debug_dbug="1"; # just to show that global.debug exists -select @@session.debug; # here we know the value and can display it +select @@global.debug_dbug="1"; # just to show that global.debug_dbug exists +select @@session.debug_dbug; # here we know the value and can display it --replace_column 2 # -show global variables like 'debug'; -show session variables like 'debug'; +show global variables like 'debug_dbug'; +show session variables like 'debug_dbug'; --replace_column 2 # -select * from information_schema.global_variables where variable_name="debug"; -select * from information_schema.session_variables where variable_name="debug"; +select * from information_schema.global_variables where variable_name='debug_dbug'; +select * from information_schema.session_variables where variable_name='debug_dbug'; --error ER_WRONG_TYPE_FOR_VAR set @@global.debug_dbug=1; diff --git a/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test b/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test index cb3797465a7..4088525b910 100644 --- a/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test +++ b/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test @@ -1,5 +1,5 @@ # -# Checks that assigning variable 'debug' in one session has no influence on +# Checks that assigning variable 'debug_dbug' in one session has no influence on # other session. (BUG#45632 of bugs.mysql.com) # # (this will not work with embedded server because mysqltest_embedded uses the @@ -14,17 +14,17 @@ connect(con2,localhost,root,,test,,); # makes output independant of current debug status connection con1; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; connection con2; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; # checks influence one session debug variable on another connection con1; set session debug_dbug="d:t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; connection con2; -show session variables like 'debug'; +show session variables like 'debug_dbug'; disconnect con1; disconnect con2; diff --git a/mysql-test/suite/sys_vars/t/lc_time_names_basic.test b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test index 5ad95af4c0d..ff676a6dfb2 100644 --- a/mysql-test/suite/sys_vars/t/lc_time_names_basic.test +++ b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test @@ -315,8 +315,6 @@ SET @@session.lc_time_names=sl_SI; SELECT @@session.lc_time_names; SET @@session.lc_time_names=sq_AL; SELECT @@session.lc_time_names; -SET @@session.lc_time_names=sr_YU; -SELECT @@session.lc_time_names; SET @@session.lc_time_names=sv_FI; SELECT @@session.lc_time_names; SET @@session.lc_time_names=sr_RS; @@ -548,8 +546,6 @@ SET @@global.lc_time_names=sl_SI; SELECT @@global.lc_time_names; SET @@global.lc_time_names=sq_AL; SELECT @@global.lc_time_names; -SET @@global.lc_time_names=sr_YU; -SELECT @@global.lc_time_names; SET @@global.lc_time_names=sv_FI; SELECT @@global.lc_time_names; SET @@global.lc_time_names=sr_RS; @@ -645,6 +641,8 @@ SET @@lc_time_names = -1; SET @@lc_time_names = 'en US'; --Error ER_UNKNOWN_LOCALE SET @@lc_time_names = 'enUS'; +--Error ER_UNKNOWN_LOCALE +SET @@session.lc_time_names=sr_YU; SET @@lc_time_names = true; SELECT @@lc_time_names AS res_with_true; diff --git a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test deleted file mode 100644 index 236c59837d8..00000000000 --- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test +++ /dev/null @@ -1,227 +0,0 @@ -############## mysql-test\t\max_tmp_tables_basic.test ############### -# # -# Variable Name: max_tmp_tables # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: numeric # -# Default Value: 32 # -# Range: 1-4294967295 # -# # -# # -# # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Salman # -# # -# Description: Test Cases of Dynamic System Variable max_tmp_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 max_tmp_tables TESTS # -#################################### - - -############################################################# -# Save initial value # -############################################################# - -SET @start_global_value = @@global.max_tmp_tables; -SELECT @start_global_value; -SET @start_session_value = @@session.max_tmp_tables; -SELECT @start_session_value; - - ---echo '#--------------------FN_DYNVARS_086_01-------------------------#' -###################################################### -# Display the DEFAULT value of max_tmp_tables # -###################################################### - -SET @@global.max_tmp_tables = 1000; -SET @@global.max_tmp_tables = DEFAULT; -SELECT @@global.max_tmp_tables; - - -SET @@session.max_tmp_tables = 1000; -SET @@session.max_tmp_tables = DEFAULT; -SELECT @@session.max_tmp_tables; - - ---echo '#--------------------FN_DYNVARS_086_02-------------------------#' -###################################################### -# Check the DEFAULT value of max_tmp_tables # -###################################################### - -SET @@global.max_tmp_tables = DEFAULT; -SELECT @@global.max_tmp_tables = 32; - -SET @@session.max_tmp_tables = DEFAULT; -SELECT @@session.max_tmp_tables = 32; - - - ---echo '#--------------------FN_DYNVARS_086_03-------------------------#' -######################################################################## -# Change the value of max_tmp_tables to a valid value for GLOBAL Scope # -######################################################################## - -SET @@global.max_tmp_tables = 1; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 2; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 65536; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 4294967295; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 4294967294; -SELECT @@global.max_tmp_tables; - ---echo '#--------------------FN_DYNVARS_086_04-------------------------#' -######################################################################### -# Change the value of max_tmp_tables to a valid value for SESSION Scope # -######################################################################### - -SET @@session.max_tmp_tables = 1; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 2; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 65536; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 4294967295; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 4294967294; -SELECT @@session.max_tmp_tables; - - ---echo '#------------------FN_DYNVARS_086_05-----------------------#' -########################################################## -# Change the value of max_tmp_tables to an invalid value # -########################################################## - -SET @@global.max_tmp_tables = -1024; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 4294967296; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = -1; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 429496729500; -SELECT @@global.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.max_tmp_tables = 65530.34; -SELECT @@global.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.max_tmp_tables = test; -SELECT @@global.max_tmp_tables; - -SET @@session.max_tmp_tables = 4294967296; -SELECT @@session.max_tmp_tables; -SET @@session.max_tmp_tables = -1; -SELECT @@session.max_tmp_tables; -SET @@session.max_tmp_tables = 429496729500; -SELECT @@session.max_tmp_tables; -SET @@session.max_tmp_tables = -001; -SELECT @@session.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.max_tmp_tables = 65530.34; -SET @@session.max_tmp_tables = 10737418241; -SELECT @@session.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.max_tmp_tables = test; -SELECT @@session.max_tmp_tables; - - ---echo '#------------------FN_DYNVARS_086_06-----------------------#' -#################################################################### -# Check if the value in GLOBAL Table matches value in variable # -#################################################################### - - -SELECT @@global.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; - ---echo '#------------------FN_DYNVARS_086_07-----------------------#' -#################################################################### -# Check if the value in SESSION Table matches value in variable # -#################################################################### - -SELECT @@session.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; - - ---echo '#------------------FN_DYNVARS_086_08-----------------------#' -#################################################################### -# Check if TRUE and FALSE values can be used on variable # -#################################################################### - -SET @@global.max_tmp_tables = TRUE; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = FALSE; -SELECT @@global.max_tmp_tables; - - ---echo '#---------------------FN_DYNVARS_086_09----------------------#' -################################################################################# -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################# - -SET @@global.max_tmp_tables = 20; -SELECT @@max_tmp_tables = @@global.max_tmp_tables; - - ---echo '#---------------------FN_DYNVARS_086_10----------------------#' -######################################################################################################## -# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable # -######################################################################################################## - -SET @@max_tmp_tables = 255; -SELECT @@max_tmp_tables = @@local.max_tmp_tables; -SELECT @@local.max_tmp_tables = @@session.max_tmp_tables; - - ---echo '#---------------------FN_DYNVARS_086_11----------------------#' -######################################################################### -# Check if max_tmp_tables can be accessed with and without @@ sign # -######################################################################### - - -SET max_tmp_tables = 102; -SELECT @@max_tmp_tables; ---Error ER_UNKNOWN_TABLE -SELECT local.max_tmp_tables; ---Error ER_UNKNOWN_TABLE -SELECT session.max_tmp_tables; ---Error ER_BAD_FIELD_ERROR -SELECT max_tmp_tables = @@session.max_tmp_tables; - - -#################################### -# Restore initial value # -#################################### - -SET @@global.max_tmp_tables = @start_global_value; -SELECT @@global.max_tmp_tables; -SET @@session.max_tmp_tables = @start_session_value; -SELECT @@session.max_tmp_tables; - - -################################################### -# END OF max_tmp_tables TESTS # -################################################### - diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test index ada22845f3e..a5162075e35 100644 --- a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test +++ b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test @@ -19,8 +19,8 @@ select * from information_schema.session_variables where variable_name='optimize # # show that it's writable # -set global optimizer_switch=4101; -set session optimizer_switch=2058; +set global optimizer_switch=2053; +set session optimizer_switch=1034; select @@global.optimizer_switch; select @@session.optimizer_switch; set global optimizer_switch="index_merge_sort_union=on"; diff --git a/mysql-test/suite/sys_vars/t/time_format_basic.test b/mysql-test/suite/sys_vars/t/time_format_basic.test deleted file mode 100644 index ec737b8c621..00000000000 --- a/mysql-test/suite/sys_vars/t/time_format_basic.test +++ /dev/null @@ -1,18 +0,0 @@ -# -# only global -# -select @@global.time_format; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.time_format; -show global variables like 'time_format'; -show session variables like 'time_format'; -select * from information_schema.global_variables where variable_name='time_format'; -select * from information_schema.session_variables where variable_name='time_format'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global time_format=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session time_format=1; diff --git a/mysql-test/suite/sys_vars/t/wsrep_causal_reads_basic.test b/mysql-test/suite/sys_vars/t/wsrep_causal_reads_basic.test deleted file mode 100644 index 6539e5cba85..00000000000 --- a/mysql-test/suite/sys_vars/t/wsrep_causal_reads_basic.test +++ /dev/null @@ -1,45 +0,0 @@ ---source include/have_wsrep.inc - ---echo # ---echo # wsrep_causal_reads ---echo # - ---echo # save the initial values -SET @wsrep_causal_reads_global_saved = @@global.wsrep_causal_reads; -SET @wsrep_causal_reads_session_saved = @@session.wsrep_causal_reads; - ---echo # default -SELECT @@global.wsrep_causal_reads; -SELECT @@session.wsrep_causal_reads; - ---echo ---echo # scope and valid values -SET @@global.wsrep_causal_reads=OFF; -SELECT @@global.wsrep_causal_reads; -SET @@global.wsrep_causal_reads=ON; -SELECT @@global.wsrep_causal_reads; - -SET @@session.wsrep_causal_reads=OFF; -SELECT @@session.wsrep_causal_reads; -SET @@session.wsrep_causal_reads=ON; -SELECT @@session.wsrep_causal_reads; -SET @@session.wsrep_causal_reads=default; -SELECT @@session.wsrep_causal_reads; - ---echo ---echo # invalid values ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.wsrep_causal_reads=NULL; ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.wsrep_causal_reads='junk'; ---error ER_WRONG_VALUE_FOR_VAR -SET @@session.wsrep_causal_reads=NULL; ---error ER_WRONG_VALUE_FOR_VAR -SET @@session.wsrep_causal_reads='junk'; - ---echo ---echo # restore the initial values -SET @@global.wsrep_causal_reads = @wsrep_causal_reads_global_saved; -SET @@session.wsrep_causal_reads = @wsrep_causal_reads_session_saved; - ---echo # End of test diff --git a/mysql-test/suite/sysschema/r/optimizer_switch.result b/mysql-test/suite/sysschema/r/optimizer_switch.result index 69aadfebf10..2d99669b06d 100644 --- a/mysql-test/suite/sysschema/r/optimizer_switch.result +++ b/mysql-test/suite/sysschema/r/optimizer_switch.result @@ -34,7 +34,6 @@ subquery_cache on table_elimination on call sys.optimizer_switch_off(); option opt -engine_condition_pushdown off index_merge_sort_intersection off mrr off mrr_cost_based off diff --git a/mysql-test/suite/sysschema/r/pr_diagnostics.result b/mysql-test/suite/sysschema/r/pr_diagnostics.result index d07295bdbe9..390cf5c0bcf 100644 --- a/mysql-test/suite/sysschema/r/pr_diagnostics.result +++ b/mysql-test/suite/sysschema/r/pr_diagnostics.result @@ -1,8 +1,8 @@ -SET @sys.debug = 'ON', +SET @sys.debug_dbug = 'ON', @sys.diagnostics.allow_i_s_tables = 'ON', @sys.diagnostics.include_raw = 'ON'; CALL sys.diagnostics(4, 2, 'full'); -SET @sys.debug = 'OFF', +SET @sys.debug_dbug = 'OFF', @sys.diagnostics.allow_i_s_tables = 'OFF', @sys.diagnostics.include_raw = 'OFF'; CALL sys.diagnostics(0, 0, 'full'); diff --git a/mysql-test/suite/sysschema/t/pr_diagnostics.test b/mysql-test/suite/sysschema/t/pr_diagnostics.test index 40ea90005a9..f8c19f98ec9 100644 --- a/mysql-test/suite/sysschema/t/pr_diagnostics.test +++ b/mysql-test/suite/sysschema/t/pr_diagnostics.test @@ -15,13 +15,13 @@ # any warnings. --disable_result_log -SET @sys.debug = 'ON', +SET @sys.debug_dbug = 'ON', @sys.diagnostics.allow_i_s_tables = 'ON', @sys.diagnostics.include_raw = 'ON'; CALL sys.diagnostics(4, 2, 'full'); -SET @sys.debug = 'OFF', +SET @sys.debug_dbug = 'OFF', @sys.diagnostics.allow_i_s_tables = 'OFF', @sys.diagnostics.include_raw = 'OFF'; --enable_result_log diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index eb22e4bfdc5..3f7f73d3264 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -181,8 +181,8 @@ a b c 2 3 y 0 1 y,n drop table t1,t2; -SET @old_debug= @@global.debug; -SET @old_debug= @@global.debug; +SET @old_debug= @@global.debug_dbug; +SET @old_debug= @@global.debug_dbug; SET GLOBAL debug_dbug= "+d,write_delay_wakeup"; CREATE TABLE t1 (a int, ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index c3f36d93316..44c3d9e59d0 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -181,8 +181,8 @@ drop table t1,t2; # Bug mdev-3938: INSERT DELAYED for a table with virtual columns # -SET @old_debug= @@global.debug; -SET @old_debug= @@global.debug; +SET @old_debug= @@global.debug_dbug; +SET @old_debug= @@global.debug_dbug; SET GLOBAL debug_dbug= "+d,write_delay_wakeup"; CREATE TABLE t1 (a int, ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 2d5d5a66232..7f8c6a43bc8 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -41,7 +41,6 @@ wsrep_commit_window # wsrep_local_state # wsrep_local_state_comment # wsrep_cert_index_size # -wsrep_causal_reads # wsrep_cert_interval # wsrep_open_transactions # wsrep_open_connections # @@ -90,7 +89,6 @@ SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NA VARIABLE_NAME WSREP_ALLOWLIST WSREP_AUTO_INCREMENT_CONTROL -WSREP_CAUSAL_READS WSREP_CERTIFICATION_RULES WSREP_CERTIFY_NONPK WSREP_CLUSTER_ADDRESS diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result index 2ce69827911..d088c4f1714 100644 --- a/mysql-test/suite/wsrep/r/variables_debug.result +++ b/mysql-test/suite/wsrep/r/variables_debug.result @@ -41,7 +41,6 @@ wsrep_commit_window # wsrep_local_state # wsrep_local_state_comment # wsrep_cert_index_size # -wsrep_causal_reads # wsrep_cert_interval # wsrep_open_transactions # wsrep_open_connections # @@ -91,7 +90,6 @@ SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NA VARIABLE_NAME WSREP_ALLOWLIST WSREP_AUTO_INCREMENT_CONTROL -WSREP_CAUSAL_READS WSREP_CERTIFICATION_RULES WSREP_CERTIFY_NONPK WSREP_CLUSTER_ADDRESS diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0fdcbb60d2e..9a3b3f812f2 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -596,7 +596,6 @@ uint reg_ext_length; const key_map key_map_empty(0); key_map key_map_full(0); // Will be initialized later -DATE_TIME_FORMAT global_date_format, global_datetime_format, global_time_format; Time_zone *default_tz; const char *mysql_real_data_home_ptr= mysql_real_data_home; @@ -3473,36 +3472,6 @@ static void init_libstrings() } -/** - Initialize one of the global date/time format variables. - - @param format_type What kind of format should be supported - @param var_ptr Pointer to variable that should be updated - - @retval - 0 ok - @retval - 1 error -*/ - -static bool init_global_datetime_format(timestamp_type format_type, - DATE_TIME_FORMAT *format) -{ - /* - Get command line option - format->format.str is already set by my_getopt - */ - format->format.length= strlen(format->format.str); - - if (parse_date_time_format(format_type, format)) - { - fprintf(stderr, "Wrong date/time format specifier: %s\n", - format->format.str); - return true; - } - return false; -} - #define COM_STATUS(X) (void*) offsetof(STATUS_VAR, X), SHOW_LONG_STATUS #define STMT_STATUS(X) COM_STATUS(com_stat[(uint) X]) @@ -8155,9 +8124,6 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument, test_flags= argument ? ((uint) atoi(argument) & ~TEST_BLOCKING) : 0; opt_endinfo=1; break; - case OPT_THREAD_CONCURRENCY: - WARN_DEPRECATED_NO_REPLACEMENT(NULL, "THREAD_CONCURRENCY"); - break; case (int) OPT_ISAM_LOG: opt_myisam_log=1; break; @@ -8459,37 +8425,6 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument, #endif break; } -#ifdef WITH_WSREP - case OPT_WSREP_CAUSAL_READS: - { - if (global_system_variables.wsrep_causal_reads) - { - WSREP_WARN("option --wsrep-causal-reads is deprecated"); - if (!(global_system_variables.wsrep_sync_wait & WSREP_SYNC_WAIT_BEFORE_READ)) - { - WSREP_WARN("--wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=%u. " - "WSREP_SYNC_WAIT_BEFORE_READ is on", - global_system_variables.wsrep_sync_wait); - global_system_variables.wsrep_sync_wait |= WSREP_SYNC_WAIT_BEFORE_READ; - } - } - else - { - if (global_system_variables.wsrep_sync_wait & WSREP_SYNC_WAIT_BEFORE_READ) { - WSREP_WARN("--wsrep-sync-wait=%u takes precedence over --wsrep-causal-reads=OFF. " - "WSREP_SYNC_WAIT_BEFORE_READ is on", - global_system_variables.wsrep_sync_wait); - global_system_variables.wsrep_causal_reads = 1; - } - } - break; - } - case OPT_WSREP_SYNC_WAIT: - global_system_variables.wsrep_causal_reads= - MY_TEST(global_system_variables.wsrep_sync_wait & - WSREP_SYNC_WAIT_BEFORE_READ); - break; -#endif /* WITH_WSREP */ } return 0; } @@ -8846,14 +8781,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr) if (opt_short_log_format) opt_specialflag|= SPECIAL_SHORT_LOG_FORMAT; - if (init_global_datetime_format(MYSQL_TIMESTAMP_DATE, - &global_date_format) || - init_global_datetime_format(MYSQL_TIMESTAMP_TIME, - &global_time_format) || - init_global_datetime_format(MYSQL_TIMESTAMP_DATETIME, - &global_datetime_format)) - return 1; - #ifdef EMBEDDED_LIBRARY one_thread_scheduler(thread_scheduler, &connection_count); /* diff --git a/sql/mysqld.h b/sql/mysqld.h index 646e6cbf195..69cfc0cad56 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -845,12 +845,7 @@ enum options_mysqld OPT_SSL_CRL, OPT_SSL_CRLPATH, OPT_SSL_KEY, - OPT_THREAD_CONCURRENCY, OPT_WANT_CORE, -#ifdef WITH_WSREP - OPT_WSREP_CAUSAL_READS, - OPT_WSREP_SYNC_WAIT, -#endif /* WITH_WSREP */ OPT_MYSQL_COMPATIBILITY, OPT_TLS_VERSION, OPT_MYSQL_TO_BE_IMPLEMENTED, diff --git a/sql/sql_class.h b/sql/sql_class.h index 3140b8059f0..855627c6a9e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -748,7 +748,6 @@ typedef struct system_variables ulong max_length_for_sort_data; ulong max_recursive_iterations; ulong max_sort_length; - ulong max_tmp_tables; ulong max_insert_delayed_threads; ulong min_examined_row_limit; ulong net_buffer_length; @@ -846,7 +845,6 @@ typedef struct system_variables my_bool column_compression_zlib_wrap; my_bool sysdate_is_now; my_bool wsrep_on; - my_bool wsrep_causal_reads; my_bool wsrep_dirty_reads; my_bool pseudo_slave_mode; my_bool session_track_schema; diff --git a/sql/sql_locale.cc b/sql/sql_locale.cc index 819cb6e100e..bf32e99841b 100644 --- a/sql/sql_locale.cc +++ b/sql/sql_locale.cc @@ -1741,23 +1741,6 @@ static TYPELIB my_locale_typelib_day_names_sr_RS = { array_elements(my_locale_day_names_sr_RS)-1, "", my_locale_day_names_sr_RS, NULL }; static TYPELIB my_locale_typelib_ab_day_names_sr_RS = { array_elements(my_locale_ab_day_names_sr_RS)-1, "", my_locale_ab_day_names_sr_RS, NULL }; -MY_LOCALE my_locale_sr_YU /* Deprecated, use sr_RS instead */ -( - 48, - "sr_YU", - "Serbian - Yugoslavia", - FALSE, - &my_locale_typelib_month_names_sr_RS, - &my_locale_typelib_ab_month_names_sr_RS, - &my_locale_typelib_day_names_sr_RS, - &my_locale_typelib_ab_day_names_sr_RS, - 9, - 10, - '.', /* decimal point sr_RS */ - '\0', /* thousands_sep sr_RS */ - "\x80", /* grouping sr_RS */ - &global_errmsgs[sr_RS] -); MY_LOCALE my_locale_sr_RS ( @@ -3540,13 +3523,6 @@ MY_LOCALE *my_locales[]= }; -MY_LOCALE *my_locales_deprecated[]= -{ - &my_locale_sr_YU, - NULL -}; - - MY_LOCALE *my_locale_by_number(uint number) { MY_LOCALE *locale; @@ -3582,30 +3558,6 @@ MY_LOCALE *my_locale_by_name(const char *name) DBUG_ASSERT(locale == my_locales[locale->number]); return locale; } - else if ((locale= my_locale_by_name(my_locales_deprecated, name))) - { - THD *thd= current_thd; - /* - Replace the deprecated locale to the corresponding - 'fresh' locale with the same ID. - */ - locale= my_locales[locale->number]; - if (thd) - { - // Send a warning to the client - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX), - name, locale->name); - } - else - { - // Send a warning to mysqld error log - sql_print_warning("The syntax '%s' is deprecated and will be removed. " - "Please use %s instead.", - name, locale->name); - } - } return locale; } diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 2ea86b5905e..554b86dc7ab 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -200,46 +200,45 @@ #define OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION (1ULL << 2) #define OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT (1ULL << 3) #define OPTIMIZER_SWITCH_INDEX_MERGE_SORT_INTERSECT (1ULL << 4) -#define deprecated_ENGINE_CONDITION_PUSHDOWN (1ULL << 5) -#define OPTIMIZER_SWITCH_INDEX_COND_PUSHDOWN (1ULL << 6) -#define OPTIMIZER_SWITCH_DERIVED_MERGE (1ULL << 7) -#define OPTIMIZER_SWITCH_DERIVED_WITH_KEYS (1ULL << 8) -#define OPTIMIZER_SWITCH_FIRSTMATCH (1ULL << 9) -#define OPTIMIZER_SWITCH_LOOSE_SCAN (1ULL << 10) -#define OPTIMIZER_SWITCH_MATERIALIZATION (1ULL << 11) -#define OPTIMIZER_SWITCH_IN_TO_EXISTS (1ULL << 12) -#define OPTIMIZER_SWITCH_SEMIJOIN (1ULL << 13) -#define OPTIMIZER_SWITCH_PARTIAL_MATCH_ROWID_MERGE (1ULL << 14) -#define OPTIMIZER_SWITCH_PARTIAL_MATCH_TABLE_SCAN (1ULL << 15) -#define OPTIMIZER_SWITCH_SUBQUERY_CACHE (1ULL << 16) +#define OPTIMIZER_SWITCH_INDEX_COND_PUSHDOWN (1ULL << 5) +#define OPTIMIZER_SWITCH_DERIVED_MERGE (1ULL << 6) +#define OPTIMIZER_SWITCH_DERIVED_WITH_KEYS (1ULL << 7) +#define OPTIMIZER_SWITCH_FIRSTMATCH (1ULL << 8) +#define OPTIMIZER_SWITCH_LOOSE_SCAN (1ULL << 9) +#define OPTIMIZER_SWITCH_MATERIALIZATION (1ULL << 10) +#define OPTIMIZER_SWITCH_IN_TO_EXISTS (1ULL << 11) +#define OPTIMIZER_SWITCH_SEMIJOIN (1ULL << 12) +#define OPTIMIZER_SWITCH_PARTIAL_MATCH_ROWID_MERGE (1ULL << 13) +#define OPTIMIZER_SWITCH_PARTIAL_MATCH_TABLE_SCAN (1ULL << 14) +#define OPTIMIZER_SWITCH_SUBQUERY_CACHE (1ULL << 15) /** If this is off, MRR is never used. */ -#define OPTIMIZER_SWITCH_MRR (1ULL << 17) +#define OPTIMIZER_SWITCH_MRR (1ULL << 16) /** If OPTIMIZER_SWITCH_MRR is on and this is on, MRR is used depending on a cost-based choice ("automatic"). If OPTIMIZER_SWITCH_MRR is on and this is off, MRR is "forced" (i.e. used as long as the storage engine is capable of doing it). */ -#define OPTIMIZER_SWITCH_MRR_COST_BASED (1ULL << 18) -#define OPTIMIZER_SWITCH_MRR_SORT_KEYS (1ULL << 19) -#define OPTIMIZER_SWITCH_OUTER_JOIN_WITH_CACHE (1ULL << 20) -#define OPTIMIZER_SWITCH_SEMIJOIN_WITH_CACHE (1ULL << 21) -#define OPTIMIZER_SWITCH_JOIN_CACHE_INCREMENTAL (1ULL << 22) -#define OPTIMIZER_SWITCH_JOIN_CACHE_HASHED (1ULL << 23) -#define OPTIMIZER_SWITCH_JOIN_CACHE_BKA (1ULL << 24) -#define OPTIMIZER_SWITCH_OPTIMIZE_JOIN_BUFFER_SIZE (1ULL << 25) -#define OPTIMIZER_SWITCH_TABLE_ELIMINATION (1ULL << 26) -#define OPTIMIZER_SWITCH_EXTENDED_KEYS (1ULL << 27) -#define OPTIMIZER_SWITCH_EXISTS_TO_IN (1ULL << 28) -#define OPTIMIZER_SWITCH_ORDERBY_EQ_PROP (1ULL << 29) -#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_DERIVED (1ULL << 30) -#define OPTIMIZER_SWITCH_SPLIT_MATERIALIZED (1ULL << 31) -#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_SUBQUERY (1ULL << 32) -#define OPTIMIZER_SWITCH_USE_ROWID_FILTER (1ULL << 33) -#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FROM_HAVING (1ULL << 34) -#define OPTIMIZER_SWITCH_NOT_NULL_RANGE_SCAN (1ULL << 35) -#define OPTIMIZER_SWITCH_HASH_JOIN_CARDINALITY (1ULL << 36) -#define OPTIMIZER_SWITCH_SARGABLE_CASEFOLD (1ULL << 37) +#define OPTIMIZER_SWITCH_MRR_COST_BASED (1ULL << 17) +#define OPTIMIZER_SWITCH_MRR_SORT_KEYS (1ULL << 18) +#define OPTIMIZER_SWITCH_OUTER_JOIN_WITH_CACHE (1ULL << 19) +#define OPTIMIZER_SWITCH_SEMIJOIN_WITH_CACHE (1ULL << 20) +#define OPTIMIZER_SWITCH_JOIN_CACHE_INCREMENTAL (1ULL << 21) +#define OPTIMIZER_SWITCH_JOIN_CACHE_HASHED (1ULL << 22) +#define OPTIMIZER_SWITCH_JOIN_CACHE_BKA (1ULL << 23) +#define OPTIMIZER_SWITCH_OPTIMIZE_JOIN_BUFFER_SIZE (1ULL << 24) +#define OPTIMIZER_SWITCH_TABLE_ELIMINATION (1ULL << 25) +#define OPTIMIZER_SWITCH_EXTENDED_KEYS (1ULL << 26) +#define OPTIMIZER_SWITCH_EXISTS_TO_IN (1ULL << 27) +#define OPTIMIZER_SWITCH_ORDERBY_EQ_PROP (1ULL << 28) +#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_DERIVED (1ULL << 29) +#define OPTIMIZER_SWITCH_SPLIT_MATERIALIZED (1ULL << 30) +#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_SUBQUERY (1ULL << 31) +#define OPTIMIZER_SWITCH_USE_ROWID_FILTER (1ULL << 32) +#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FROM_HAVING (1ULL << 33) +#define OPTIMIZER_SWITCH_NOT_NULL_RANGE_SCAN (1ULL << 34) +#define OPTIMIZER_SWITCH_HASH_JOIN_CARDINALITY (1ULL << 35) +#define OPTIMIZER_SWITCH_SARGABLE_CASEFOLD (1ULL << 36) #define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \ diff --git a/sql/sql_time.cc b/sql/sql_time.cc index 753f78ccc22..910d535f8bb 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -546,322 +546,6 @@ void calc_time_from_sec(MYSQL_TIME *to, ulong seconds, ulong microseconds) } -/* - Parse a format string specification - - SYNOPSIS - parse_date_time_format() - format_type Format of string (time, date or datetime) - format_str String to parse - format_length Length of string - date_time_format Format to fill in - - NOTES - Fills in date_time_format->positions for all date time parts. - - positions marks the position for a datetime element in the format string. - The position array elements are in the following order: - YYYY-DD-MM HH-MM-DD.FFFFFF AM - 0 1 2 3 4 5 6 7 - - If positions[0]= 5, it means that year will be the forth element to - read from the parsed date string. - - RETURN - 0 ok - 1 error -*/ - -bool parse_date_time_format(timestamp_type format_type, - const char *format, uint format_length, - DATE_TIME_FORMAT *date_time_format) -{ - uint offset= 0, separators= 0; - const char *ptr= format, *format_str; - const char *end= ptr+format_length; - uchar *dt_pos= date_time_format->positions; - /* need_p is set if we are using AM/PM format */ - bool need_p= 0, allow_separator= 0; - ulong part_map= 0, separator_map= 0; - const char *parts[16]; - - date_time_format->time_separator= 0; - date_time_format->flag= 0; // For future - - /* - Fill position with 'dummy' arguments to found out if a format tag is - used twice (This limit's the format to 255 characters, but this is ok) - */ - dt_pos[0]= dt_pos[1]= dt_pos[2]= dt_pos[3]= - dt_pos[4]= dt_pos[5]= dt_pos[6]= dt_pos[7]= 255; - - for (; ptr != end; ptr++) - { - if (*ptr == '%' && ptr+1 != end) - { - uint UNINIT_VAR(position); - switch (*++ptr) { - case 'y': // Year - case 'Y': - position= 0; - break; - case 'c': // Month - case 'm': - position= 1; - break; - case 'd': - case 'e': - position= 2; - break; - case 'h': - case 'I': - case 'l': - need_p= 1; // Need AM/PM - /* Fall through */ - case 'k': - case 'H': - position= 3; - break; - case 'i': - position= 4; - break; - case 's': - case 'S': - position= 5; - break; - case 'f': - position= 6; - if (dt_pos[5] != offset-1 || ptr[-2] != '.') - return 1; // Wrong usage of %f - break; - case 'p': // AM/PM - if (offset == 0) // Can't be first - return 0; - position= 7; - break; - default: - return 1; // Unknown controll char - } - if (dt_pos[position] != 255) // Don't allow same tag twice - return 1; - parts[position]= ptr-1; - - /* - If switching from time to date, ensure that all time parts - are used - */ - if (part_map && position <= 2 && !(part_map & (1 | 2 | 4))) - offset=5; - part_map|= (ulong) 1 << position; - dt_pos[position]= offset++; - allow_separator= 1; - } - else - { - /* - Don't allow any characters in format as this could easily confuse - the date reader - */ - if (!allow_separator) - return 1; // No separator here - allow_separator= 0; // Don't allow two separators - separators++; - /* Store in separator_map which parts are punct characters */ - if (my_ispunct(&my_charset_latin1, *ptr)) - separator_map|= (ulong) 1 << (offset-1); - else if (!my_isspace(&my_charset_latin1, *ptr)) - return 1; - } - } - - /* If no %f, specify it after seconds. Move %p up, if necessary */ - if ((part_map & 32) && !(part_map & 64)) - { - dt_pos[6]= dt_pos[5] +1; - parts[6]= parts[5]; // For later test in (need_p) - if (dt_pos[6] == dt_pos[7]) // Move %p one step up if used - dt_pos[7]++; - } - - /* - Check that we have not used a non legal format specifier and that all - format specifiers have been used - - The last test is to ensure that %p is used if and only if - it's needed. - */ - if ((format_type == MYSQL_TIMESTAMP_DATETIME && - !test_all_bits(part_map, (1 | 2 | 4 | 8 | 16 | 32))) || - (format_type == MYSQL_TIMESTAMP_DATE && part_map != (1 | 2 | 4)) || - (format_type == MYSQL_TIMESTAMP_TIME && - !test_all_bits(part_map, 8 | 16 | 32)) || - !allow_separator || // %option should be last - (need_p && dt_pos[6] +1 != dt_pos[7]) || - (need_p ^ (dt_pos[7] != 255))) - return 1; - - if (dt_pos[6] != 255) // If fractional seconds - { - /* remove fractional seconds from later tests */ - uint pos= dt_pos[6] -1; - /* Remove separator before %f from sep map */ - separator_map= ((separator_map & ((ulong) (1 << pos)-1)) | - ((separator_map & ~((ulong) (1 << pos)-1)) >> 1)); - if (part_map & 64) - { - separators--; // There is always a separator - need_p= 1; // force use of separators - } - } - - /* - Remove possible separator before %p from sep_map - (This can either be at position 3, 4, 6 or 7) h.m.d.%f %p - */ - if (dt_pos[7] != 255) - { - if (need_p && parts[7] != parts[6]+2) - separators--; - } - /* - Calculate if %p is in first or last part of the datetime field - - At this point we have either %H-%i-%s %p 'year parts' or - 'year parts' &H-%i-%s %p" as %f was removed above - */ - offset= dt_pos[6] <= 3 ? 3 : 6; - /* Remove separator before %p from sep map */ - separator_map= ((separator_map & ((ulong) (1 << offset)-1)) | - ((separator_map & ~((ulong) (1 << offset)-1)) >> 1)); - - format_str= 0; - switch (format_type) { - case MYSQL_TIMESTAMP_DATE: - format_str= known_date_time_formats[INTERNAL_FORMAT].date_format; - /* fall through */ - case MYSQL_TIMESTAMP_TIME: - if (!format_str) - format_str=known_date_time_formats[INTERNAL_FORMAT].time_format; - - /* - If there is no separators, allow the internal format as we can read - this. If separators are used, they must be between each part - */ - if (format_length == 6 && !need_p && - !my_charset_bin.strnncoll(format, 6, format_str, 6)) - return 0; - if (separator_map == (1 | 2)) - { - if (format_type == MYSQL_TIMESTAMP_TIME) - { - if (*(format+2) != *(format+5)) - break; // Error - /* Store the character used for time formats */ - date_time_format->time_separator= *(format+2); - } - return 0; - } - break; - case MYSQL_TIMESTAMP_DATETIME: - /* - If there is no separators, allow the internal format as we can read - this. If separators are used, they must be between each part. - Between DATE and TIME we also allow space as separator - */ - if ((format_length == 12 && !need_p && - !my_charset_bin.strnncoll( - format, 12, - known_date_time_formats[INTERNAL_FORMAT].datetime_format, - 12)) || - (separators == 5 && separator_map == (1 | 2 | 8 | 16))) - return 0; - break; - default: - DBUG_ASSERT(0); - break; - } - return 1; // Error -} - - -/* - Create a DATE_TIME_FORMAT object from a format string specification - - SYNOPSIS - date_time_format_make() - format_type Format to parse (time, date or datetime) - format_str String to parse - format_length Length of string - - NOTES - The returned object should be freed with my_free() - - RETURN - NULL ponter: Error - new object -*/ - -DATE_TIME_FORMAT -*date_time_format_make(timestamp_type format_type, - const char *format_str, uint format_length) -{ - DATE_TIME_FORMAT tmp; - - if (format_length && format_length < 255 && - !parse_date_time_format(format_type, format_str, - format_length, &tmp)) - { - tmp.format.str= format_str; - tmp.format.length= format_length; - return date_time_format_copy((THD *)0, &tmp); - } - return 0; -} - - -/* - Create a copy of a DATE_TIME_FORMAT object - - SYNOPSIS - date_and_time_format_copy() - thd Set if variable should be allocated in thread mem - format format to copy - - NOTES - The returned object should be freed with my_free() - - RETURN - NULL ponter: Error - new object -*/ - -DATE_TIME_FORMAT *date_time_format_copy(THD *thd, DATE_TIME_FORMAT *format) -{ - DATE_TIME_FORMAT *new_format; - size_t length= sizeof(*format) + format->format.length + 1; - char *format_pos; - - if (thd) - new_format= (DATE_TIME_FORMAT *) thd->alloc(length); - else - new_format= (DATE_TIME_FORMAT *) my_malloc(key_memory_DATE_TIME_FORMAT, - length, MYF(MY_WME)); - if (new_format) - { - /* Put format string after current pos */ - new_format->format.str= format_pos= (char*) (new_format+1); - memcpy((char*) new_format->positions, (char*) format->positions, - sizeof(format->positions)); - new_format->time_separator= format->time_separator; - /* We make the string null terminated for easy printf in SHOW VARIABLES */ - memcpy(format_pos, format->format.str, format->format.length); - format_pos[format->format.length]= 0; - new_format->format.length= format->format.length; - } - return new_format; -} - - KNOWN_DATE_TIME_FORMAT known_date_time_formats[6]= { {"USA", "%m.%d.%Y", "%Y-%m-%d %H.%i.%s", "%h:%i:%s %p" }, diff --git a/sql/sql_time.h b/sql/sql_time.h index c918eb6d807..255ebfeb663 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -81,11 +81,6 @@ void make_truncated_value_warning(THD *thd, const char *db_name, const char *table_name, const char *field_name); -extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type, - const char *format_str, - uint format_length); -extern DATE_TIME_FORMAT *date_time_format_copy(THD *thd, - DATE_TIME_FORMAT *format); const char *get_date_time_format_str(KNOWN_DATE_TIME_FORMAT *format, timestamp_type type); bool my_TIME_to_str(const MYSQL_TIME *ltime, String *str, uint dec); @@ -128,24 +123,7 @@ void calc_time_from_sec(MYSQL_TIME *to, ulong seconds, ulong microseconds); uint calc_week(const MYSQL_TIME *l_time, uint week_behaviour, uint *year); int calc_weekday(long daynr,bool sunday_first_day_of_week); -bool parse_date_time_format(timestamp_type format_type, - const char *format, uint format_length, - DATE_TIME_FORMAT *date_time_format); -/* convenience wrapper */ -inline bool parse_date_time_format(timestamp_type format_type, - DATE_TIME_FORMAT *date_time_format) -{ - return parse_date_time_format(format_type, - date_time_format->format.str, - (uint) date_time_format->format.length, - date_time_format); -} - - -extern DATE_TIME_FORMAT global_date_format; -extern DATE_TIME_FORMAT global_datetime_format; -extern DATE_TIME_FORMAT global_time_format; extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[]; extern LEX_CSTRING interval_type_to_name[]; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index f83b57d5185..338ed49f11d 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1055,12 +1055,6 @@ static Sys_var_charptr_fscs Sys_datadir( CMD_LINE(REQUIRED_ARG, 'h'), DEFAULT(mysql_real_data_home)); #ifndef DBUG_OFF -static Sys_var_dbug Sys_dbug( - "debug", "Built-in DBUG debugger", sys_var::SESSION, - CMD_LINE(OPT_ARG, '#'), DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(check_has_super), ON_UPDATE(0), - DEPRECATED("'@@debug_dbug'")); // since 5.5.37 - static Sys_var_dbug Sys_debug_dbug( "debug_dbug", "Built-in DBUG debugger", sys_var::SESSION, CMD_LINE(OPT_ARG, '#'), DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG, @@ -2643,13 +2637,6 @@ static Sys_var_max_user_conn Sys_max_user_connections( VALID_RANGE(-1, INT_MAX), DEFAULT(0), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(if_checking_enabled)); -static Sys_var_ulong Sys_max_tmp_tables( - "max_tmp_tables", "Unused, will be removed.", - SESSION_VAR(max_tmp_tables), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, UINT_MAX), DEFAULT(32), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("")); // since 10.1.2 - static Sys_var_ulong Sys_max_write_lock_count( "max_write_lock_count", "After this many write locks, allow some read locks to run in between", @@ -2876,7 +2863,6 @@ export const char *optimizer_switch_names[]= { "index_merge","index_merge_union","index_merge_sort_union", "index_merge_intersection","index_merge_sort_intersection", - "engine_condition_pushdown", "index_condition_pushdown", "derived_merge", "derived_with_keys", "firstmatch","loosescan","materialization","in_to_exists","semijoin", @@ -2907,17 +2893,6 @@ export const char *optimizer_switch_names[]= "default", NullS }; -static bool fix_optimizer_switch(sys_var *self, THD *thd, - enum_var_type type) -{ - SV *sv= (type == OPT_GLOBAL) ? &global_system_variables : &thd->variables; - if (sv->optimizer_switch & deprecated_ENGINE_CONDITION_PUSHDOWN) - push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), - "engine_condition_pushdown=on"); // since 10.1.1 - return false; -} static bool check_legal_optimizer_switch(sys_var *self, THD *thd, set_var *var) { @@ -2934,8 +2909,7 @@ static Sys_var_flagset Sys_optimizer_switch( "Fine-tune the optimizer behavior", SESSION_VAR(optimizer_switch), CMD_LINE(REQUIRED_ARG), optimizer_switch_names, DEFAULT(OPTIMIZER_SWITCH_DEFAULT), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_legal_optimizer_switch), - ON_UPDATE(fix_optimizer_switch)); + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_legal_optimizer_switch)); static Sys_var_flagset Sys_optimizer_trace( "optimizer_trace", @@ -4502,39 +4476,6 @@ static Sys_var_debug_sync Sys_debug_sync( DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_has_super)); #endif /* defined(ENABLED_DEBUG_SYNC) */ -/** - "time_format" "date_format" "datetime_format" - - the following three variables are unused, and the source of confusion - (bug reports like "I've changed date_format, but date format hasn't changed. - I've made them read-only, to alleviate the situation somewhat. - - @todo make them NO_CMD_LINE ? -*/ -static Sys_var_charptr Sys_date_format( - "date_format", "The DATE format (ignored)", - READ_ONLY GLOBAL_VAR(global_date_format.format.str), - CMD_LINE(REQUIRED_ARG), - DEFAULT(known_date_time_formats[ISO_FORMAT].date_format), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("")); // since 10.1.2 - -static Sys_var_charptr Sys_datetime_format( - "datetime_format", "The DATETIME format (ignored)", - READ_ONLY GLOBAL_VAR(global_datetime_format.format.str), - CMD_LINE(REQUIRED_ARG), - DEFAULT(known_date_time_formats[ISO_FORMAT].datetime_format), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("")); // since 10.1.2 - -static Sys_var_charptr Sys_time_format( - "time_format", "The TIME format (ignored)", - READ_ONLY GLOBAL_VAR(global_time_format.format.str), - CMD_LINE(REQUIRED_ARG), - DEFAULT(known_date_time_formats[ISO_FORMAT].time_format), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("")); // since 10.1.2 - static bool fix_autocommit(sys_var *self, THD *thd, enum_var_type type) { if (type == OPT_GLOBAL) @@ -6242,25 +6183,15 @@ static Sys_var_enum Sys_wsrep_certification_rules( NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0)); -static Sys_var_mybool Sys_wsrep_causal_reads( - "wsrep_causal_reads", "Setting this variable is equivalent " - "to setting wsrep_sync_wait READ flag", - SESSION_VAR(wsrep_causal_reads), - CMD_LINE(OPT_ARG, OPT_WSREP_CAUSAL_READS), DEFAULT(FALSE), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(wsrep_causal_reads_update), - DEPRECATED("'@@wsrep_sync_wait=1'")); // since 10.1.3 - static Sys_var_uint Sys_wsrep_sync_wait( "wsrep_sync_wait", "Ensure \"synchronous\" read view before executing " "an operation of the type specified by bitmask: 1 - READ(includes " "SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - " "INSERT and REPLACE", - SESSION_VAR(wsrep_sync_wait), CMD_LINE(OPT_ARG, OPT_WSREP_SYNC_WAIT), + SESSION_VAR(wsrep_sync_wait), CMD_LINE(OPT_ARG), VALID_RANGE(WSREP_SYNC_WAIT_NONE, WSREP_SYNC_WAIT_MAX), DEFAULT(WSREP_SYNC_WAIT_NONE), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(wsrep_sync_wait_update)); + NO_MUTEX_GUARD, NOT_IN_BINLOG); static const char *wsrep_mode_names[]= { diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 50eeb5f4e2b..ea6676e916d 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1611,7 +1611,7 @@ bool wsrep_sync_wait (THD* thd, uint mask) { case wsrep::e_not_supported_error: msg= "synchronous reads by wsrep backend. " - "Please unset wsrep_causal_reads variable."; + "Please unset wsrep_sync_wait variable."; err= ER_NOT_SUPPORTED_YET; break; default: diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 3343fcd2445..077d3ba9b50 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -208,36 +208,6 @@ bool wsrep_on_check(sys_var *self, THD* thd, set_var* var) return false; } -bool wsrep_causal_reads_update (sys_var *self, THD* thd, enum_var_type var_type) -{ - if (thd->variables.wsrep_causal_reads) { - thd->variables.wsrep_sync_wait |= WSREP_SYNC_WAIT_BEFORE_READ; - } else { - thd->variables.wsrep_sync_wait &= ~WSREP_SYNC_WAIT_BEFORE_READ; - } - - // update global settings too. - if (global_system_variables.wsrep_causal_reads) { - global_system_variables.wsrep_sync_wait |= WSREP_SYNC_WAIT_BEFORE_READ; - } else { - global_system_variables.wsrep_sync_wait &= ~WSREP_SYNC_WAIT_BEFORE_READ; - } - - return false; -} - -bool wsrep_sync_wait_update (sys_var* self, THD* thd, enum_var_type var_type) -{ - thd->variables.wsrep_causal_reads= thd->variables.wsrep_sync_wait & - WSREP_SYNC_WAIT_BEFORE_READ; - - // update global settings too - global_system_variables.wsrep_causal_reads= global_system_variables.wsrep_sync_wait & - WSREP_SYNC_WAIT_BEFORE_READ; - - return false; -} - template static T parse_value(char** startptr, char** endptr) { diff --git a/sql/wsrep_var.h b/sql/wsrep_var.h index 3bebae7fb79..7251990d211 100644 --- a/sql/wsrep_var.h +++ b/sql/wsrep_var.h @@ -44,10 +44,8 @@ bool wsrep_refresh_provider_options(); #define DEFAULT_ARGS (THD* thd, enum_var_type var_type) #define INIT_ARGS (const char* opt) -extern bool wsrep_causal_reads_update UPDATE_ARGS; extern bool wsrep_on_check CHECK_ARGS; extern bool wsrep_on_update UPDATE_ARGS; -extern bool wsrep_sync_wait_update UPDATE_ARGS; extern bool wsrep_start_position_check CHECK_ARGS; extern bool wsrep_start_position_update UPDATE_ARGS; extern bool wsrep_start_position_init INIT_ARGS; diff --git a/storage/mroonga/mrn_table.cpp b/storage/mroonga/mrn_table.cpp index 037a6a59487..f144aafede0 100644 --- a/storage/mroonga/mrn_table.cpp +++ b/storage/mroonga/mrn_table.cpp @@ -530,7 +530,6 @@ int mrn_add_index_param(MRN_SHARE *share, KEY *key_info, int i) char *sprit_ptr[2]; char *tmp_ptr, *start_ptr; #endif - THD *thd = current_thd; MRN_DBUG_ENTER_FUNCTION(); #if MYSQL_VERSION_ID >= 50500 @@ -592,13 +591,6 @@ int mrn_add_index_param(MRN_SHARE *share, KEY *key_info, int i) case 5: MRN_PARAM_STR_LIST("table", index_table, i); break; - case 6: - push_warning_printf(thd, MRN_SEVERITY_WARNING, - ER_WARN_DEPRECATED_SYNTAX, - ER(ER_WARN_DEPRECATED_SYNTAX), - "parser", "tokenizer"); - MRN_PARAM_STR_LIST("parser", key_tokenizer, i); - break; case 9: MRN_PARAM_STR_LIST("tokenizer", key_tokenizer, i); break; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_comment.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_comment.result deleted file mode 100644 index 29f27d156f1..00000000000 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_comment.result +++ /dev/null @@ -1,29 +0,0 @@ -DROP TABLE IF EXISTS diaries; -CREATE TABLE diaries ( -id int PRIMARY KEY AUTO_INCREMENT, -body text, -FULLTEXT INDEX body_index (body) -COMMENT 'parser "TokenBigramSplitSymbolAlphaDigit"' -) DEFAULT CHARSET utf8; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -INSERT INTO diaries (body) VALUES ("will start Groonga!"); -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -INSERT INTO diaries (body) VALUES ("starting Groonga..."); -INSERT INTO diaries (body) VALUES ("started Groonga."); -SELECT * FROM diaries; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -SELECT * FROM diaries -WHERE MATCH(body) AGAINST("+start" IN BOOLEAN MODE) -ORDER BY id; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -DROP TABLE diaries; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result deleted file mode 100644 index f827c0ad529..00000000000 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_parser_off.result +++ /dev/null @@ -1,40 +0,0 @@ -DROP TABLE IF EXISTS variables; -CREATE TABLE variables ( -id INT PRIMARY KEY AUTO_INCREMENT, -name TEXT, -FULLTEXT INDEX (name) COMMENT 'parser "off"' -) DEFAULT CHARSET=utf8; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix"); -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -INSERT INTO variables (name) VALUES ("mroonga_default_tokenizer"); -INSERT INTO variables (name) VALUES ("mroonga_default_wrapper_engine"); -INSERT INTO variables (name) VALUES ("mroonga_dry_write"); -INSERT INTO variables (name) VALUES ("mroonga_enable_optimization"); -INSERT INTO variables (name) VALUES ("mroonga_libgroonga_version"); -INSERT INTO variables (name) VALUES ("mroonga_log_file"); -INSERT INTO variables (name) VALUES ("mroonga_log_level"); -INSERT INTO variables (name) VALUES ("mroonga_match_escalation_threshold"); -INSERT INTO variables (name) VALUES ("mroonga_version"); -SELECT * FROM variables; -id name -1 mroonga_database_path_prefix -2 mroonga_default_tokenizer -3 mroonga_default_wrapper_engine -4 mroonga_dry_write -5 mroonga_enable_optimization -6 mroonga_libgroonga_version -7 mroonga_log_file -8 mroonga_log_level -9 mroonga_match_escalation_threshold -10 mroonga_version -SELECT * FROM variables -WHERE MATCH (name) AGAINST ("mroonga_default*" IN BOOLEAN MODE); -id name -3 mroonga_default_wrapper_engine -2 mroonga_default_tokenizer -DROP TABLE variables; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test deleted file mode 100644 index c4bc32d18ce..00000000000 --- a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_comment.test +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright(C) 2011-2015 Kouhei Sutou -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - ---source include/not_embedded.inc ---source ../../include/mroonga/have_mroonga.inc - ---disable_warnings -DROP TABLE IF EXISTS diaries; ---enable_warnings - -CREATE TABLE diaries ( - id int PRIMARY KEY AUTO_INCREMENT, - body text, - FULLTEXT INDEX body_index (body) - COMMENT 'parser "TokenBigramSplitSymbolAlphaDigit"' -) DEFAULT CHARSET utf8; - ---enable_prepare_warnings -INSERT INTO diaries (body) VALUES ("will start Groonga!"); -INSERT INTO diaries (body) VALUES ("starting Groonga..."); -INSERT INTO diaries (body) VALUES ("started Groonga."); - -SELECT * FROM diaries; -SELECT * FROM diaries - WHERE MATCH(body) AGAINST("+start" IN BOOLEAN MODE) - ORDER BY id; - -DROP TABLE diaries; - ---source ../../include/mroonga/have_mroonga_deinit.inc diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test b/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test deleted file mode 100644 index 2191a28c483..00000000000 --- a/storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_parser_off.test +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright(C) 2013 Kouhei Sutou -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - ---source include/not_embedded.inc ---source ../../include/mroonga/have_mroonga.inc - ---disable_warnings -DROP TABLE IF EXISTS variables; ---enable_warnings - -CREATE TABLE variables ( - id INT PRIMARY KEY AUTO_INCREMENT, - name TEXT, - FULLTEXT INDEX (name) COMMENT 'parser "off"' -) DEFAULT CHARSET=utf8; - ---enable_prepare_warnings -INSERT INTO variables (name) VALUES ("mroonga_database_path_prefix"); -INSERT INTO variables (name) VALUES ("mroonga_default_tokenizer"); -INSERT INTO variables (name) VALUES ("mroonga_default_wrapper_engine"); -INSERT INTO variables (name) VALUES ("mroonga_dry_write"); -INSERT INTO variables (name) VALUES ("mroonga_enable_optimization"); -INSERT INTO variables (name) VALUES ("mroonga_libgroonga_version"); -INSERT INTO variables (name) VALUES ("mroonga_log_file"); -INSERT INTO variables (name) VALUES ("mroonga_log_level"); -INSERT INTO variables (name) VALUES ("mroonga_match_escalation_threshold"); -INSERT INTO variables (name) VALUES ("mroonga_version"); - -SELECT * FROM variables; -SELECT * FROM variables - WHERE MATCH (name) AGAINST ("mroonga_default*" IN BOOLEAN MODE); - -DROP TABLE variables; - ---source ../../include/mroonga/have_mroonga_deinit.inc diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_parser_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_parser_comment.result deleted file mode 100644 index 4d9d20dc8ab..00000000000 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_parser_comment.result +++ /dev/null @@ -1,25 +0,0 @@ -drop table if exists diaries; -create table diaries ( -id int primary key auto_increment, -body text, -fulltext index body_index (body) -comment 'parser "TokenBigramSplitSymbolAlphaDigit"' -) comment = 'engine "innodb"' default charset utf8; -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -insert into diaries (body) values ("will start Groonga!"); -Warnings: -Warning 1287 'parser' is deprecated and will be removed in a future release. Please use tokenizer instead -insert into diaries (body) values ("starting Groonga..."); -insert into diaries (body) values ("started Groonga."); -select * from diaries; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -select * from diaries where match(body) against("+start" in boolean mode) order by id; -id body -1 will start Groonga! -2 starting Groonga... -3 started Groonga. -drop table diaries; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test deleted file mode 100644 index 81342a74f2e..00000000000 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/create_table_parser_comment.test +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright(C) 2011-2015 Kouhei Sutou -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - ---source include/not_embedded.inc ---source include/have_innodb.inc ---source ../../include/mroonga/have_mroonga.inc - ---disable_warnings -drop table if exists diaries; ---enable_warnings - -create table diaries ( - id int primary key auto_increment, - body text, - fulltext index body_index (body) - comment 'parser "TokenBigramSplitSymbolAlphaDigit"' -) comment = 'engine "innodb"' default charset utf8; ---enable_prepare_warnings -insert into diaries (body) values ("will start Groonga!"); -insert into diaries (body) values ("starting Groonga..."); -insert into diaries (body) values ("started Groonga."); -select * from diaries; -select * from diaries where match(body) against("+start" in boolean mode) order by id; -drop table diaries; - ---source ../../include/mroonga/have_mroonga_deinit.inc diff --git a/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff index 797907fa71a..78c47ded0c9 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff @@ -1,14 +1,5 @@ --- suite/storage_engine/type_char_indexes.result 2014-10-12 14:22:11.000000000 +0400 +++ suite/storage_engine/type_char_indexes.reject 2014-10-12 14:22:41.000000000 +0400 -@@ -100,7 +100,7 @@ - Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release. - EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; - id select_type table type possible_keys key key_len ref rows Extra --# # # range c_v c_v # # # Using index condition -+# # # ALL c_v NULL # # # Using where - SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; - c c20 v16 v128 - b char3 varchar1a varchar1b @@ -137,7 +137,7 @@ r3a EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result b/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result index 195215331b8..e5f463a602d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/covered_unpack_info_format.result @@ -34,7 +34,7 @@ id bigfield 33 yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy include/assert.inc [Not eligible for optimization, access via fake_id of big row.: 0 rocksdb_covered_secondary_key_lookups] DROP TABLE t1; -set session debug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; CREATE TABLE t1 ( id INT, fake_id INT, @@ -43,7 +43,7 @@ PRIMARY KEY (id), KEY bf (bigfield(32)), KEY fid (fake_id, bigfield(32)) ) ENGINE=rocksdb; -set session debug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; INSERT INTO t1 VALUES (1, 1001, REPEAT('a', 1)), (8, 1008, REPEAT('b', 8)), (24, 1024, REPEAT('c', 24)), diff --git a/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result b/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result index 4386ad590ae..cb632d02a35 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/force_shutdown.result @@ -3,7 +3,7 @@ pk int not null primary key, col1 varchar(10) ) engine=rocksdb; insert into t1 values (1,1),(2,2),(3,3); -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; select * from t1 where pk=1; # testing unclean shutdown on stuck instance # Run shutdown sql command with forcing kill (exit code 127) @@ -27,7 +27,7 @@ ERROR HY000: Only read_only instance can be killed. SHUTDOWN 127; Got one of the listed errors # restart the server -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; select * from t1 where pk=1; SET GLOBAL read_only=1; # verifying SHUTDOWN read_only works with read_only instance diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result index 8cdfa910739..f54bb086893 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found.result @@ -19,12 +19,12 @@ insert into t2 select a,a,a,a from t1; create table t3 like t2; insert into t3 select * from t2; include/sync_slave_sql_with_master.inc -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t2 set col1=100 where kp1 between 1 and 3 and mod(kp2,2)=0; set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t2 where pk=2; delete from t2 where pk=3; @@ -35,13 +35,13 @@ pk kp1 kp2 col1 0 0 0 0 1 1 1 1 4 4 4 4 -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t3 set col1=100 where kp1 between 1 and 4 and mod(kp2,2)=0; call mtr.add_suppression("Deadlock found when trying to get lock"); set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t3 where pk=2; delete from t3 where pk=3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result index 8cdfa910739..f54bb086893 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rpl_row_not_found_rc.result @@ -19,12 +19,12 @@ insert into t2 select a,a,a,a from t1; create table t3 like t2; insert into t3 select * from t2; include/sync_slave_sql_with_master.inc -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t2 set col1=100 where kp1 between 1 and 3 and mod(kp2,2)=0; set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t2 where pk=2; delete from t2 where pk=3; @@ -35,13 +35,13 @@ pk kp1 kp2 col1 0 0 0 0 1 1 1 1 4 4 4 4 -set global debug= 'd,dbug.rocksdb.get_row_by_rowid'; +set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; include/stop_slave.inc include/start_slave.inc update t3 set col1=100 where kp1 between 1 and 4 and mod(kp2,2)=0; call mtr.add_suppression("Deadlock found when trying to get lock"); set debug_sync= 'now WAIT_FOR Reached'; -set global debug = ''; +set global debug_dbug = ''; set sql_log_bin=0; delete from t3 where pk=2; delete from t3 where pk=3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result b/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result index 60d9f69a398..656cd346754 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/skip_core_dump_on_error.result @@ -4,13 +4,13 @@ insert into mz values(1); affected rows: 1 commit; affected rows: 0 -SET debug= '+d,abort_with_io_write_error'; +SET debug_dbug= '+d,abort_with_io_write_error'; affected rows: 0 set global binlog_error_action=1; affected rows: 0 -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug d,abort_with_io_write_error +debug_dbug d,abort_with_io_write_error affected rows: 1 show global variables like 'binlog_error_action'; Variable_name Value diff --git a/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test b/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test index ccd91a61ff0..85a36683827 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/covered_unpack_info_format.test @@ -45,7 +45,7 @@ DROP TABLE t1; # Create same table with older format to test compatibility # -set session debug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '+d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; CREATE TABLE t1 ( id INT, fake_id INT, @@ -54,7 +54,7 @@ CREATE TABLE t1 ( KEY bf (bigfield(32)), KEY fid (fake_id, bigfield(32)) ) ENGINE=rocksdb; -set session debug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; +set session debug_dbug= '-d,MYROCKS_NO_COVERED_BITMAP_FORMAT'; INSERT INTO t1 VALUES (1, 1001, REPEAT('a', 1)), (8, 1008, REPEAT('b', 8)), diff --git a/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test b/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test index 1817bc06fc3..19d0bf40c31 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/force_shutdown.test @@ -13,7 +13,7 @@ create table t1 ( insert into t1 values (1,1),(2,2),(3,3); connection conn1; -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; send select * from t1 where pk=1; --echo # testing unclean shutdown on stuck instance @@ -70,7 +70,7 @@ SHUTDOWN 127; connect (conn2, localhost, root,,test); connection conn2; -set session debug= "+d,myrocks_busy_loop_on_row_read"; +set session debug_dbug= "+d,myrocks_busy_loop_on_row_read"; send select * from t1 where pk=1; connection default; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc b/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc index 9575abb7019..3ef3cae01e4 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc +++ b/storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc @@ -45,7 +45,7 @@ set binlog_format=@tmp_binlog_format; --source include/sync_slave_sql_with_master.inc connection slave; -let $old_debug = `select @@global.debug`; +let $old_debug = `select @@global.debug_dbug`; set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid'; --source include/stop_slave.inc --source include/start_slave.inc diff --git a/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test b/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test index 451eed057ac..ac085893666 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/skip_core_dump_on_error.test @@ -19,13 +19,13 @@ insert into mz values(1); commit; # simulate a write error -SET debug= '+d,abort_with_io_write_error'; +SET debug_dbug= '+d,abort_with_io_write_error'; # we want to abort server if we fail to write (ABORT_SERVER) set global binlog_error_action=1; # diplay the values of the key parameters -show session variables like 'debug'; +show session variables like 'debug_dbug'; show global variables like 'binlog_error_action'; show global variables like 'skip_core_dump_on_error'; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test b/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test index 6ee2f03e74d..fcdf9b1fa5f 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/type_char_indexes.test @@ -63,13 +63,6 @@ EXPLAIN SELECT v128, COUNT(*) FROM t1 USE INDEX FOR GROUP BY (c_v) GROUP BY v128 --sorted_result SELECT v128, COUNT(*) FROM t1 USE INDEX FOR GROUP BY (c_v) GROUP BY v128; -SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; ---replace_column 9 # -EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; ---sorted_result -SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; -SET SESSION optimizer_switch = @@global.optimizer_switch; - DROP TABLE t1; --enable_parsing diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result index 493107ec071..45ca980ade8 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/multiclient_2pc.result @@ -3,7 +3,7 @@ SET GLOBAL MAX_BINLOG_SIZE = 4096; SET GLOBAL ROCKSDB_ENABLE_2PC = ON; create table t1 (a int primary key, b int, c varchar(255)) engine=rocksdb; 'con1' -SET SESSION debug="d,crash_commit_after_log"; +SET SESSION debug_dbug="d,crash_commit_after_log"; SET DEBUG_SYNC='rocksdb.prepared SIGNAL parked WAIT_FOR go'; insert into t1 values (1, 1, "iamtheogthealphaandomega");; 'con2' diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result index 352ceff236c..5c333cf8a3f 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe.result @@ -12,10 +12,10 @@ select * from slave_gtid_info; Id Database_name Last_gtid 1 mtr uuid:1 2 test uuid:4 -SET GLOBAL debug = '+d,crash_before_update_pos'; +SET GLOBAL debug_dbug = '+d,crash_before_update_pos'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -58,10 +58,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_after_update_pos_before_apply'; +SET GLOBAL debug_dbug = '+d,crash_after_update_pos_before_apply'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -102,10 +102,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_before_writing_xid'; +SET GLOBAL debug_dbug = '+d,crash_before_writing_xid'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -146,10 +146,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,half_binlogged_transaction'; +SET GLOBAL debug_dbug = '+d,half_binlogged_transaction'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -190,10 +190,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_before'; +SET GLOBAL debug_dbug = '+d,crash_commit_before'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -234,10 +234,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_log'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_log'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -278,10 +278,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_prepare'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_prepare'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -322,10 +322,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after'; +SET GLOBAL debug_dbug = '+d,crash_commit_after'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result index a518de2b6e3..441d90c6a79 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_crash_safe_optimized.result @@ -12,10 +12,10 @@ select * from slave_gtid_info; Id Database_name Last_gtid 1 mtr 2 test uuid:4 -SET GLOBAL debug = '+d,crash_before_update_pos'; +SET GLOBAL debug_dbug = '+d,crash_before_update_pos'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -58,10 +58,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_after_update_pos_before_apply'; +SET GLOBAL debug_dbug = '+d,crash_after_update_pos_before_apply'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -102,10 +102,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_before_writing_xid'; +SET GLOBAL debug_dbug = '+d,crash_before_writing_xid'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -146,10 +146,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,half_binlogged_transaction'; +SET GLOBAL debug_dbug = '+d,half_binlogged_transaction'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -190,10 +190,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_before'; +SET GLOBAL debug_dbug = '+d,crash_commit_before'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -234,10 +234,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_log'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_log'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -278,10 +278,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after_prepare'; +SET GLOBAL debug_dbug = '+d,crash_commit_after_prepare'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid @@ -322,10 +322,10 @@ use mysql; select * from slave_gtid_info; Id Database_name Last_gtid 1 test uuid:3 -SET GLOBAL debug = '+d,crash_commit_after'; +SET GLOBAL debug_dbug = '+d,crash_commit_after'; insert into t1 values(3); include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; use mysql; select * from slave_gtid_info; Id Database_name Last_gtid diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result index 2b5c5300a0f..47bb9e23a29 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_gtid_rocksdb_sys_header.result @@ -5,11 +5,11 @@ Note #### Storing MySQL user name or password information in the master info rep [connection master] create table t1 (a int primary key) engine=rocksdb; insert into t1 values(1); -SET GLOBAL debug = '+d,crash_before_writing_xid'; +SET GLOBAL debug_dbug = '+d,crash_before_writing_xid'; insert into t1 values(2); ERROR HY000: Lost connection to server during query include/rpl_reconnect.inc -SET GLOBAL debug = ``; +SET GLOBAL debug_dbug = ``; include/start_slave.inc RocksDB: Last MySQL Gtid master_uuid:2 drop table t1; diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result index 0eadc7deafe..5da619eb9fa 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_mts_dependency_unique_key_conflicts.result @@ -8,12 +8,12 @@ set @save.slave_parallel_workers= @@global.slave_parallel_workers; set @save.slave_use_idempotent_for_recovery= @@global.slave_use_idempotent_for_recovery; set @save.mts_dependency_replication= @@global.mts_dependency_replication; set @save.mts_dependency_order_commits= @@global.mts_dependency_order_commits; -set @save.debug= @@global.debug; +set @save.debug_dbug= @@global.debug_dbug; set @@global.slave_parallel_workers= 2; set @@global.slave_use_idempotent_for_recovery= YES; set @@global.mts_dependency_replication= STMT; set @@global.mts_dependency_order_commits= false; -set @@global.debug= '+d,dbug.dep_wait_before_update_execution'; +set @@global.debug_dbug= '+d,dbug.dep_wait_before_update_execution'; include/start_slave.inc create table t1 (a int primary key, b int unique key) engine = rocksdb; insert into t1 values(1, 1); @@ -39,6 +39,6 @@ set @@global.slave_parallel_workers= @save.slave_parallel_workers; set @@global.mts_dependency_replication= @save.mts_dependency_replication; set @@global.slave_use_idempotent_for_recovery= @save.slave_use_idempotent_for_recovery; set @@global.mts_dependency_order_commits= @save.mts_dependency_order_commits; -set @@global.debug= @save.debug; +set @@global.debug_dbug= @save.debug_dbug; include/start_slave.inc include/rpl_end.inc diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test index ff484171213..fc97361c125 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/multiclient_2pc.test @@ -31,7 +31,7 @@ connect (con2, localhost, root,,); connection con1; --echo 'con1' --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="d,crash_commit_after_log"; +SET SESSION debug_dbug="d,crash_commit_after_log"; SET DEBUG_SYNC='rocksdb.prepared SIGNAL parked WAIT_FOR go'; --error 0,2013 --send insert into t1 values (1, 1, "iamtheogthealphaandomega"); diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test index d1793c4af1e..dc324aef57a 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test @@ -5,12 +5,12 @@ source include/have_gtid.inc; source include/have_debug.inc; source include/not_valgrind.inc; ---let $old_debug = `select @@global.debug;` +--let $old_debug = `select @@global.debug_dbug;` connection master; create table t1 (a int primary key) engine=rocksdb; insert into t1 values(1); ---eval SET GLOBAL debug = '+d,crash_before_writing_xid' +--eval SET GLOBAL debug_dbug = '+d,crash_before_writing_xid' --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --error 2013 insert into t1 values(2); @@ -19,7 +19,7 @@ insert into t1 values(2); --let $rpl_server_number = 1 --source include/rpl_reconnect.inc ---eval SET GLOBAL debug = `$old_debug` +--eval SET GLOBAL debug_dbug = `$old_debug` connection slave; disable_warnings; diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test index 5869b9a39b9..cece6a884c4 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_mts_dependency_unique_key_conflicts.test @@ -9,12 +9,12 @@ set @save.slave_parallel_workers= @@global.slave_parallel_workers; set @save.slave_use_idempotent_for_recovery= @@global.slave_use_idempotent_for_recovery; set @save.mts_dependency_replication= @@global.mts_dependency_replication; set @save.mts_dependency_order_commits= @@global.mts_dependency_order_commits; -set @save.debug= @@global.debug; +set @save.debug_dbug= @@global.debug_dbug; set @@global.slave_parallel_workers= 2; set @@global.slave_use_idempotent_for_recovery= YES; set @@global.mts_dependency_replication= STMT; set @@global.mts_dependency_order_commits= false; -set @@global.debug= '+d,dbug.dep_wait_before_update_execution'; +set @@global.debug_dbug= '+d,dbug.dep_wait_before_update_execution'; source include/start_slave.inc; connection master; @@ -58,7 +58,7 @@ set @@global.slave_parallel_workers= @save.slave_parallel_workers; set @@global.mts_dependency_replication= @save.mts_dependency_replication; set @@global.slave_use_idempotent_for_recovery= @save.slave_use_idempotent_for_recovery; set @@global.mts_dependency_order_commits= @save.mts_dependency_order_commits; -set @@global.debug= @save.debug; +set @@global.debug_dbug= @save.debug_dbug; source include/start_slave.inc; source include/rpl_end.inc; diff --git a/storage/spider/spd_param.cc b/storage/spider/spd_param.cc index 7d8e51f6b9e..a20601acbcf 100644 --- a/storage/spider/spd_param.cc +++ b/storage/spider/spd_param.cc @@ -1563,7 +1563,7 @@ SPIDER_THDVAR_VALUE_FUNC(bool, local_lock_table) static MYSQL_THDVAR_INT( use_pushdown_udf, /* name */ PLUGIN_VAR_RQCMDARG, /* opt */ - "Remote server transmission existence when UDF is used at condition and \"engine_condition_pushdown=1\"", /* comment */ + "Remote server transmission existence when UDF is used at condition", /* comment */ NULL, /* check */ NULL, /* update */ 0, /* def */