database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-32104 remove deprecated features

Browse Source 
In particular:

* @@debug
  deprecated since 5.5.37
* sr_YU locale
  deprecated since 10.0.11
* "engine_condition_pushdown" in the @@optimizer_switch
  deprecated since 10.1.1
* @@date_format, @@datetime_format, @@time_format, @@max_tmp_tables
  deprecated since  10.1.2
* @@wsrep_causal_reads
  deprecated since 10.1.3
* "parser" in mroonga table comment
  deprecated since 10.2.11
This commit is contained in:
Sergei Golubchik
2023-09-06 16:03:04 +02:00
parent 4f9396b9f8
commit 82174dae06
161 changed files with 317 additions and 2308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/default_optimizer_switch.inc
View File

@ -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;

24
mysql-test/lib/v1/mysql-test-run.pl
View File

@ -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);
}

2
mysql-test/main/connect2.result
View File

@ -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,,;

2
mysql-test/main/connect2.test
View File

@ -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

2
mysql-test/main/create_or_replace2.result
View File

@ -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';

2
mysql-test/main/create_or_replace2.test
View File

@ -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

1
mysql-test/main/date_formats-master.opt
View File

@ -1 +0,0 @@
--date-format=%d.%m.%Y --time-format=%H.%i.%s

30
mysql-test/main/date_formats.result
View File

@ -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;
#

128
mysql-test/main/date_formats.test
View File

@ -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 #

2
mysql-test/main/filesort_debug.result
View File

@ -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
#

2
mysql-test/main/filesort_debug.test
View File

@ -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

8
mysql-test/main/locale.result
View File

@ -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

8
mysql-test/main/locale.test
View File

@ -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;

2
mysql-test/main/lock_sync.test
View File

@ -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

8
mysql-test/main/multi_update_big.test
View File

@ -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;
}

26
mysql-test/main/mysqld--help.result
View File

@ -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

6
mysql-test/main/mysqltest_tracking_info.result
View File

@ -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

2
mysql-test/main/mysqltest_tracking_info.test
View File

@ -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;

2
mysql-test/main/mysqltest_tracking_info_debug.result
View File

@ -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)

2
mysql-test/main/mysqltest_tracking_info_debug.test
View File

@ -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';

4
mysql-test/main/show_analyze.result
View File

@ -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

4
mysql-test/main/show_analyze.test
View File

@ -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 <idle thread>

4
mysql-test/main/show_analyze_json.result
View File

@ -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

4
mysql-test/main/show_analyze_json.test
View File

@ -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 <idle thread>

4
mysql-test/main/show_explain.result
View File

@ -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

4
mysql-test/main/show_explain.test
View File

@ -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 <idle thread>

4
mysql-test/main/show_explain_json.result
View File

@ -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

4
mysql-test/main/show_explain_json.test
View File

@ -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 <idle thread>

2
mysql-test/main/show_explain_non_select.result
View File

@ -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;

2
mysql-test/main/show_explain_non_select.test
View File

@ -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';
#

27
mysql-test/main/subselect4.result
View File

@ -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

29
mysql-test/main/subselect4.test
View File

@ -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

2
mysql-test/main/subselect_debug.result
View File

@ -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))

2
mysql-test/main/subselect_debug.test
View File

@ -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));

2
mysql-test/main/subselect_exists2in.result
View File

@ -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

2
mysql-test/main/subselect_exists2in.test
View File

@ -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');

2
mysql-test/mariadb-test-run.pl
View File

@ -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)
}
}

2
mysql-test/suite/binlog/include/binlog_incident-master.opt
View File

@ -1 +1 @@
--loose-debug=+d,incident_database_resync_on_replace
--loose-debug-dbug=+d,incident_database_resync_on_replace

2
mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt
View File

@ -1 +1 @@
--loose-debug=d,simulate_kill_bug27571
--loose-debug-dbug=d,simulate_kill_bug27571

8
mysql-test/suite/encryption/r/innodb_encrypt_freed.result
View File

@ -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);

2
mysql-test/suite/encryption/t/innodb_encrypt_freed.test
View File

@ -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

1
mysql-test/suite/engines/rr_trx/include/rr_init.test
View File

@ -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
}

1
mysql-test/suite/galera/r/galera_defaults.result
View File

@ -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://

3
mysql-test/suite/galera/r/galera_var_sync_wait.result
View File

@ -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;

2
mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt
View File

@ -1 +1 @@
--wsrep-sync-wait=0 --wsrep-causal-reads=OFF
--wsrep-sync-wait=0

1
mysql-test/suite/galera/t/galera_var_sync_wait.test
View File

@ -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`

12
mysql-test/suite/innodb/r/innodb-blob.result
View File

@ -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;

4
mysql-test/suite/innodb/r/innodb-index-debug.result
View File

@ -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';

12
mysql-test/suite/innodb/r/innodb-table-online.result
View File

@ -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;

4
mysql-test/suite/innodb/r/log_file_size.result
View File

@ -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

4
mysql-test/suite/innodb/r/page_reorganize.result
View File

@ -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

6
mysql-test/suite/innodb/t/innodb-blob.test
View File

@ -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

2
mysql-test/suite/innodb/t/innodb-index-debug.test
View File

@ -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';

6
mysql-test/suite/innodb/t/innodb-table-online.test
View File

@ -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;

4
mysql-test/suite/innodb/t/log_file_size.test
View File

@ -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;

2
mysql-test/suite/innodb/t/page_reorganize.test
View File

@ -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;

4
mysql-test/suite/innodb_fts/r/ft_result_cache_limit.result
View File

@ -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

2
mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test
View File

@ -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`);

4
mysql-test/suite/innodb_gis/r/check_rtree.result
View File

@ -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));

4
mysql-test/suite/innodb_gis/r/rollback.result
View File

@ -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);

4
mysql-test/suite/innodb_gis/r/rtree_compress.result
View File

@ -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(*)

4
mysql-test/suite/innodb_gis/r/rtree_create_inplace.result
View File

@ -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;

2
mysql-test/suite/innodb_gis/t/check_rtree.test
View File

@ -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));

2
mysql-test/suite/innodb_gis/t/rollback.test
View File

@ -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;

2
mysql-test/suite/innodb_gis/t/rtree_compress.test
View File

@ -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;

2
mysql-test/suite/innodb_gis/t/rtree_create_inplace.test
View File

@ -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.

2
mysql-test/suite/mariabackup/undo_space_id.opt
View File

@ -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

2
mysql-test/suite/perfschema/include/hostcache_set_state.inc
View File

@ -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;

4
mysql-test/suite/perfschema/r/ortho_iter.result
View File

@ -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;

4
mysql-test/suite/perfschema/t/ortho_iter.test
View File

@ -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;

4
mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test
View File

@ -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;

2
mysql-test/suite/rpl/r/rpl_bug26395.result
View File

@ -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);

2
mysql-test/suite/rpl/r/rpl_row_end_of_statement_loss.result
View File

@ -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;

2
mysql-test/suite/rpl/r/rpl_semi_sync_slave_reply_fail.result
View File

@ -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;

16
mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result
View File

@ -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

4
mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result
View File

@ -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;

4
mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
View File

@ -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;

4
mysql-test/suite/rpl/t/rpl_bug26395.test
View File

@ -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';

6
mysql-test/suite/rpl/t/rpl_corruption.test
View File

@ -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.

2
mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt
View File

@ -1 +1 @@
--loose-debug=d,pretend_version_50034_in_binlog
--loose-debug-dbug=d,pretend_version_50034_in_binlog

2
mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt
View File

@ -1 +1 @@
--loose-debug=+d,LOAD_DATA_INFILE_has_fatal_error
--loose-debug-dbug=+d,LOAD_DATA_INFILE_has_fatal_error

2
mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt
View File

@ -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

2
mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss.test
View File

@ -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

2
mysql-test/suite/rpl/t/rpl_semi_sync_slave_reply_fail.test
View File

@ -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

10
mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test
View File

@ -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

2
mysql-test/suite/rpl/t/rpl_skip_incident-master.opt
View File

@ -1 +1 @@
--loose-debug=+d,incident_database_resync_on_replace
--loose-debug-dbug=+d,incident_database_resync_on_replace

4
mysql-test/suite/rpl/t/rpl_start_alter_restart_master.test
View File

@ -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;

4
mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test
View File

@ -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;

11
mysql-test/suite/storage_engine/type_char_indexes.result
View File

@ -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 <CUSTOM_COL_OPTIONS>,
c20 CHAR(20) <CUSTOM_COL_OPTIONS>,

7
mysql-test/suite/storage_engine/type_char_indexes.test
View File

@ -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;
}

21
mysql-test/suite/sys_vars/r/date_format_basic.result
View File

@ -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

21
mysql-test/suite/sys_vars/r/datetime_format_basic.result
View File

@ -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

27
mysql-test/suite/sys_vars/r/debug_basic.result
View File

@ -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'

20
mysql-test/suite/sys_vars/r/debug_dbug_basic.result
View File

@ -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;

16
mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result
View File

@ -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;

14
mysql-test/suite/sys_vars/r/lc_time_names_basic.result
View File

@ -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

251
mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result
View File

@ -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

38
mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
View File

@ -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;

15
mysql-test/suite/sys_vars/r/sysvars_debug.result
View File

@ -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

9
mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More