#At file:///export/home/tmp/x/mysql-next-mr-bugfixing-wl5185/ based on revid:tor.didriksen@stripped29-agg834ysn83ucdo1
3353 Magne Mahre 2010-11-02
WL#5185 Remove deprecated 5.1 features
This patch removes a set of options, syntax and variables
that was formerly deprecated in MySQL 5.1.
The specific regressions tests in the sys_vars suite
that tests the removed variables are also removed.
System options:
-------------------
--skip-thread-priority removed
-l, --log[=name] removed
--log-slow-queries[=name] removed
--one-thread removed
--rpl-recovery-rank=# was already removed
System variables:
------------------
sql_low_priority_updates removed
sql_max_join_size removed
sql_big_tables removed
storage_engine will be removed later
rpl_recovery_rank was already removed
log removed
log_slow_queries removed
have_csv removed
have_innodb removed
have_ndbcluster removed
have_partitioning removed
table_cache was already removed
engine_condition_pushdown removed
SQL:
-----------------
SLAVE START removed
SLAVE STOP removed
ONE_SHOT removed
SET OPTION removed
FLUSH MASTER was already removed
FLUSH SLAVE was already removed
USING/TYPE before ON will be removed later
Notes:
'storage_engine' was deprecated in 5.5, so it
can't be removed in this version. It will be
removed two GA releases later.
The documentation on 'USING/TYPE before ON'
has been inconsistent, and there has not been
given a proper deprecation warning on the use
of the syntax.
See also
Bug #57920 Inconsistency in syntax and
example for CREATE INDEX
Bug #36140 Inconsistent synonymy of USING
and TYPE for index creation
@ mysql-test/extra/rpl_tests/rpl_charset.test
Removed the ONE_SHOT test case
removed:
mysql-test/r/optimizer_switch_eng_cond_pushdown1.result
mysql-test/r/optimizer_switch_eng_cond_pushdown2.result
mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
mysql-test/suite/sys_vars/r/have_csv_basic.result
mysql-test/suite/sys_vars/r/have_innodb_basic.result
mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result
mysql-test/suite/sys_vars/r/have_partitioning_basic.result
mysql-test/suite/sys_vars/r/log_basic.result
mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
mysql-test/suite/sys_vars/r/sql_big_tables_func.result
mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
mysql-test/suite/sys_vars/t/have_csv_basic.test
mysql-test/suite/sys_vars/t/have_innodb_basic.test
mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test
mysql-test/suite/sys_vars/t/have_partitioning_basic.test
mysql-test/suite/sys_vars/t/log_basic.test
mysql-test/suite/sys_vars/t/log_slow_queries_basic.test
mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
mysql-test/suite/sys_vars/t/sql_big_tables_func.test
mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test
mysql-test/suite/sys_vars/t/sql_max_join_size_func.test
mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt
mysql-test/t/optimizer_switch_eng_cond_pushdown1.test
mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt
mysql-test/t/optimizer_switch_eng_cond_pushdown2.test
modified:
mysql-test/extra/rpl_tests/rpl_charset.test
mysql-test/r/events_logs_tests.result
mysql-test/r/log_state.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/variables.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
mysql-test/suite/perfschema/r/short_option_1.result
mysql-test/suite/perfschema/t/no_threads-master.opt
mysql-test/suite/perfschema/t/short_option_1-master.opt
mysql-test/suite/rpl/r/rpl_charset.result
mysql-test/suite/rpl/r/rpl_replicate_do.result
mysql-test/suite/rpl/t/rpl_replicate_do.test
mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
mysql-test/suite/sys_vars/r/sql_big_selects_func.result
mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt
mysql-test/suite/sys_vars/t/general_log_file_func-master.opt
mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt
mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt
mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt
mysql-test/suite/sys_vars/t/sql_big_selects_func.test
mysql-test/t/events_logs_tests-master.opt
mysql-test/t/events_logs_tests.test
mysql-test/t/log_state-master.opt
mysql-test/t/log_state.test
mysql-test/t/log_state_bug33693-master.opt
mysql-test/t/log_tables-big-master.opt
mysql-test/t/log_tables-master.opt
mysql-test/t/multi_statement-master.opt
mysql-test/t/mysql_client_test-master.opt
mysql-test/t/no-threads-master.opt
mysql-test/t/ps-master.opt
mysql-test/t/show_check-master.opt
mysql-test/t/union-master.opt
mysql-test/t/variables.test
scripts/mysql_system_tables.sql
sql/mysqld.cc
sql/mysqld.h
sql/sql_plugin.cc
sql/sql_yacc.yy
sql/sys_vars.cc
tests/mysql_client_test.c
=== modified file 'mysql-test/extra/rpl_tests/rpl_charset.test'
--- a/mysql-test/extra/rpl_tests/rpl_charset.test 2009-12-22 09:35:56 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_charset.test 2010-11-02 11:53:54 +0000
@@ -104,18 +104,6 @@ connection master;
set global character_set_server=latin2;
set global character_set_server=latin1; # back
-# Check that SET ONE_SHOT is really one shot
-
-set one_shot @@character_set_server=latin5;
-set @@max_join_size=1000;
-select @@character_set_server;
-select @@character_set_server;
-set @@character_set_server=latin5;
-select @@character_set_server;
-select @@character_set_server;
-
-set one_shot max_join_size=1000000;
-
# Test of wrong character set numbers;
error 1115;
set character_set_client=9999999;
=== modified file 'mysql-test/r/events_logs_tests.result'
--- a/mysql-test/r/events_logs_tests.result 2007-09-05 18:14:43 +0000
+++ b/mysql-test/r/events_logs_tests.result 2010-11-02 11:53:54 +0000
@@ -38,9 +38,9 @@ USER_HOST select 'events_logs_test' as i
Check slow query log
Ensure that slow logging is on
-show variables like 'log_slow_queries';
+show variables like 'slow_query_log';
Variable_name Value
-log_slow_queries ON
+slow_query_log ON
Demonstrate that session value has no effect
=== modified file 'mysql-test/r/log_state.result'
--- a/mysql-test/r/log_state.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/r/log_state.result 2010-11-02 11:53:54 +0000
@@ -10,8 +10,6 @@ where Variable_name = 'log' or Variable_
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
Variable_name Value
general_log OFF
-log OFF
-log_slow_queries OFF
slow_query_log OFF
flush logs;
set global general_log= ON;
@@ -34,8 +32,6 @@ where Variable_name = 'log' or Variable_
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
Variable_name Value
general_log ON
-log ON
-log_slow_queries OFF
slow_query_log OFF
# Establish connection con1 (user=root)
# Switch to connection con1
@@ -62,8 +58,6 @@ where Variable_name = 'log' or Variable_
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
Variable_name Value
general_log ON
-log ON
-log_slow_queries ON
slow_query_log ON
set global general_log= ON;
set global general_log= OFF;
@@ -90,8 +84,6 @@ where Variable_name = 'log' or Variable_
Variable_name = 'general_log' or Variable_name = 'slow_query_log';
Variable_name Value
general_log ON
-log ON
-log_slow_queries OFF
slow_query_log OFF
show variables like 'general_log_file';
Variable_name Value
@@ -187,71 +179,6 @@ SET GLOBAL slow_query_log = ON;
SET GLOBAL READ_ONLY = OFF;
SET GLOBAL general_log = @old_general_log;
SET GLOBAL slow_query_log = @old_slow_query_log;
-SET GLOBAL general_log = ON;
-SHOW VARIABLES LIKE 'general_log';
-Variable_name Value
-general_log ON
-SHOW VARIABLES LIKE 'log';
-Variable_name Value
-log ON
-SELECT @@general_log, @@log;
-@@general_log @@log
-1 1
-SET GLOBAL log = 0;
-Warnings:
-Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead
-SHOW VARIABLES LIKE 'general_log';
-Variable_name Value
-general_log OFF
-SHOW VARIABLES LIKE 'log';
-Variable_name Value
-log OFF
-SELECT @@general_log, @@log;
-@@general_log @@log
-0 0
-SET GLOBAL general_log = 1;
-SHOW VARIABLES LIKE 'general_log';
-Variable_name Value
-general_log ON
-SHOW VARIABLES LIKE 'log';
-Variable_name Value
-log ON
-SELECT @@general_log, @@log;
-@@general_log @@log
-1 1
-SHOW VARIABLES LIKE 'slow_query_log';
-Variable_name Value
-slow_query_log OFF
-SHOW VARIABLES LIKE 'log_slow_queries';
-Variable_name Value
-log_slow_queries OFF
-SELECT @@slow_query_log, @@log_slow_queries;
-@@slow_query_log @@log_slow_queries
-0 0
-SET GLOBAL log_slow_queries = 0;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SHOW VARIABLES LIKE 'slow_query_log';
-Variable_name Value
-slow_query_log OFF
-SHOW VARIABLES LIKE 'log_slow_queries';
-Variable_name Value
-log_slow_queries OFF
-SELECT @@slow_query_log, @@log_slow_queries;
-@@slow_query_log @@log_slow_queries
-0 0
-SET GLOBAL slow_query_log = 1;
-SHOW VARIABLES LIKE 'slow_query_log';
-Variable_name Value
-slow_query_log ON
-SHOW VARIABLES LIKE 'log_slow_queries';
-Variable_name Value
-log_slow_queries ON
-SELECT @@slow_query_log, @@log_slow_queries;
-@@slow_query_log @@log_slow_queries
-1 1
-SET GLOBAL general_log = @old_general_log;
-SET GLOBAL slow_query_log = @old_slow_query_log;
SET GLOBAL general_log_file= CONCAT('/not existing path/log.maste', 'r');
ERROR 42000: Variable 'general_log_file' can't be set to the value of '/not existing path/log.master'
SET GLOBAL general_log_file= NULL;
@@ -280,34 +207,6 @@ SET GLOBAL general_log_file = @old_gener
SET GLOBAL slow_query_log_file = @old_slow_query_log_file;
# -- End of Bug#32748.
-deprecated:
-SET GLOBAL log = 0;
-Warnings:
-Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead
-SET GLOBAL log_slow_queries = 0;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SET GLOBAL log = DEFAULT;
-Warnings:
-Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead
-SET GLOBAL log_slow_queries = DEFAULT;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-not deprecated:
-SELECT @@global.general_log_file INTO @my_glf;
-SELECT @@global.slow_query_log_file INTO @my_sqlf;
-SET GLOBAL general_log = 0;
-SET GLOBAL slow_query_log = 0;
-SET GLOBAL general_log_file = 'WL4403_G.log';
-SET GLOBAL slow_query_log_file = 'WL4403_SQ.log';
-SET GLOBAL general_log_file = @my_glf;
-SET GLOBAL slow_query_log_file = @my_sqlf;
-SET GLOBAL general_log = DEFAULT;
-SET GLOBAL slow_query_log = DEFAULT;
-SET @@global.general_log = @old_general_log;
-SET @@global.general_log_file = @old_general_log_file;
-SET @@global.slow_query_log = @old_slow_query_log;
-SET @@global.slow_query_log_file = @old_slow_query_log_file;
#
# Bug #49756 Rows_examined is always 0 in the slow query log
# for update statements
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result 2010-10-27 14:46:44 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result 2010-11-02 11:53:54 +0000
@@ -137,10 +137,6 @@ The following options may be given as th
--div-precision-increment=#
Precision of the result of '/' operator will be increased
on that value
- --engine-condition-pushdown
- Push supported query conditions to the storage engine.
- Deprecated, use --optimizer-switch instead.
- (Defaults to on; use --skip-engine-condition-pushdown to disable.)
--event-scheduler[=name]
Enable the event scheduler. Possible values are ON, OFF,
and DISABLED (keep the event scheduler completely
@@ -222,8 +218,6 @@ The following options may be given as th
--lock-wait-timeout=#
Timeout in seconds to wait for a lock before returning an
error.
- -l, --log[=name] Log connections and queries to file (deprecated option,
- use --general-log/--general-log-file instead).
--log-bin[=name] Log update queries in binary format. Optional (but
strongly recommended to avoid replication problems if
server's hostname changes) argument should be the chosen
@@ -254,12 +248,6 @@ The following options may be given as th
--log-slow-admin-statements
Log slow OPTIMIZE, ANALYZE, ALTER and other
administrative statements to the slow log if it is open.
- --log-slow-queries[=name]
- Log slow queries to a table or log file. Defaults logging
- to table mysql.slow_log or hostname-slow.log if
- --log-output=file is used. Must be enabled to activate
- other slow log options. Deprecated option, use
- --slow-query-log/--slow-query-log-file instead.
--log-slow-slave-statements
Log slow statements executed by slave thread to the slow
log if it is open.
@@ -390,8 +378,6 @@ The following options may be given as th
Enable old-style user limits (before 5.0.3, user
resources were counted per each user+host vs. per
account).
- --one-thread (Deprecated): Only use one thread (for debugging under
- Linux). Use thread-handling=no-threads instead.
--open-files-limit=#
If this is not 0, then mysqld will use this value to
reserve file descriptors to use with setrlimit(). If this
@@ -623,10 +609,6 @@ The following options may be given as th
Don't allow 'SHOW DATABASE' commands
--skip-slave-start If set, slave is not autostarted.
--skip-stack-trace Don't print a stack trace on failure.
- --skip-thread-priority
- Don't give threads different priorities. This option is
- deprecated because it has no effect; the implied behavior
- is already the default.
--slave-compressed-protocol
Use compression on master/slave protocol
--slave-exec-mode=name
@@ -776,7 +758,6 @@ delayed-insert-timeout 300
delayed-queue-size 1000
disconnect-slave-event-count 0
div-precision-increment 4
-engine-condition-pushdown TRUE
event-scheduler OFF
expire-logs-days 0
external-locking FALSE
=== removed file 'mysql-test/r/optimizer_switch_eng_cond_pushdown1.result'
--- a/mysql-test/r/optimizer_switch_eng_cond_pushdown1.result 2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/optimizer_switch_eng_cond_pushdown1.result 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-1 1 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
=== removed file 'mysql-test/r/optimizer_switch_eng_cond_pushdown2.result'
--- a/mysql-test/r/optimizer_switch_eng_cond_pushdown2.result 2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/optimizer_switch_eng_cond_pushdown2.result 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result 2010-10-26 09:10:59 +0000
+++ b/mysql-test/r/variables.result 2010-11-02 11:53:54 +0000
@@ -563,15 +563,9 @@ select @@sql_auto_is_null;
@@sql_auto_is_null
0
set sql_big_selects=1;
-set sql_big_tables=1;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
set sql_buffer_result=1;
set sql_log_bin=1;
set sql_log_off=1;
-set sql_low_priority_updates=1;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
set sql_quote_show_create=1;
set sql_safe_updates=1;
set sql_select_limit=1;
@@ -769,9 +763,6 @@ select ifnull(@@character_set_results,"r
ifnull(@@character_set_results,"really null")
really null
set names latin1;
-select @@have_innodb;
-@@have_innodb
-#
*** Various tests with LC_TIME_NAMES
*** LC_TIME_NAMES: testing case insensitivity
set @@lc_time_names='ru_ru';
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result 2010-10-21 12:18:25 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result 2010-11-02 11:53:54 +0000
@@ -8,25 +8,25 @@ use performance_schema;
show tables like "user_table";
Tables_in_performance_schema (user_table)
user_table
-ERROR 1050 (42S01) at line 67: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 89: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 111: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 133: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 146: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 159: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 171: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 242: Table 'SETUP_ACTORS' already exists
-ERROR 1050 (42S01) at line 250: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 259: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 267: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 287: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 68: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 90: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 112: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 134: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 147: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 160: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 172: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 181: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 192: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 204: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 213: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 223: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 233: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 243: Table 'SETUP_ACTORS' already exists
+ERROR 1050 (42S01) at line 251: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 260: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 268: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 288: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@@ -39,25 +39,25 @@ use performance_schema;
show tables like "user_view";
Tables_in_performance_schema (user_view)
user_view
-ERROR 1050 (42S01) at line 67: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 89: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 111: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 133: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 146: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 159: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 171: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 242: Table 'SETUP_ACTORS' already exists
-ERROR 1050 (42S01) at line 250: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 259: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 267: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 287: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 68: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 90: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 112: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 134: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 147: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 160: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 172: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 181: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 192: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 204: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 213: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 223: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 233: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 243: Table 'SETUP_ACTORS' already exists
+ERROR 1050 (42S01) at line 251: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 260: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 268: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 288: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@@ -68,25 +68,25 @@ drop view test.user_view;
create procedure test.user_proc()
select "Not supposed to be here";
update mysql.proc set db='performance_schema' where name='user_proc';
-ERROR 1050 (42S01) at line 67: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 89: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 111: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 133: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 146: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 159: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 171: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 242: Table 'SETUP_ACTORS' already exists
-ERROR 1050 (42S01) at line 250: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 259: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 267: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 287: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 68: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 90: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 112: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 134: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 147: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 160: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 172: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 181: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 192: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 204: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 213: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 223: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 233: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 243: Table 'SETUP_ACTORS' already exists
+ERROR 1050 (42S01) at line 251: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 260: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 268: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 288: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -97,25 +97,25 @@ drop procedure test.user_proc;
create function test.user_func() returns integer
return 0;
update mysql.proc set db='performance_schema' where name='user_func';
-ERROR 1050 (42S01) at line 67: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 89: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 111: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 133: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 146: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 159: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 171: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 242: Table 'SETUP_ACTORS' already exists
-ERROR 1050 (42S01) at line 250: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 259: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 267: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 287: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 68: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 90: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 112: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 134: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 147: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 160: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 172: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 181: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 192: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 204: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 213: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 223: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 233: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 243: Table 'SETUP_ACTORS' already exists
+ERROR 1050 (42S01) at line 251: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 260: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 268: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 288: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@@ -126,25 +126,25 @@ drop function test.user_func;
create event test.user_event on schedule every 1 day do
select "not supposed to be here";
update mysql.event set db='performance_schema' where name='user_event';
-ERROR 1050 (42S01) at line 67: Table 'COND_INSTANCES' already exists
-ERROR 1050 (42S01) at line 89: Table 'EVENTS_WAITS_CURRENT' already exists
-ERROR 1050 (42S01) at line 111: Table 'EVENTS_WAITS_HISTORY' already exists
-ERROR 1050 (42S01) at line 133: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
-ERROR 1050 (42S01) at line 146: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 159: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 171: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 180: Table 'FILE_INSTANCES' already exists
-ERROR 1050 (42S01) at line 191: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
-ERROR 1050 (42S01) at line 203: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
-ERROR 1050 (42S01) at line 212: Table 'MUTEX_INSTANCES' already exists
-ERROR 1050 (42S01) at line 222: Table 'PERFORMANCE_TIMERS' already exists
-ERROR 1050 (42S01) at line 232: Table 'RWLOCK_INSTANCES' already exists
-ERROR 1050 (42S01) at line 242: Table 'SETUP_ACTORS' already exists
-ERROR 1050 (42S01) at line 250: Table 'SETUP_CONSUMERS' already exists
-ERROR 1050 (42S01) at line 259: Table 'SETUP_INSTRUMENTS' already exists
-ERROR 1050 (42S01) at line 267: Table 'SETUP_TIMERS' already exists
-ERROR 1050 (42S01) at line 287: Table 'THREADS' already exists
-ERROR 1644 (HY000) at line 705: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 68: Table 'COND_INSTANCES' already exists
+ERROR 1050 (42S01) at line 90: Table 'EVENTS_WAITS_CURRENT' already exists
+ERROR 1050 (42S01) at line 112: Table 'EVENTS_WAITS_HISTORY' already exists
+ERROR 1050 (42S01) at line 134: Table 'EVENTS_WAITS_HISTORY_LONG' already exists
+ERROR 1050 (42S01) at line 147: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 160: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 172: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 181: Table 'FILE_INSTANCES' already exists
+ERROR 1050 (42S01) at line 192: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists
+ERROR 1050 (42S01) at line 204: Table 'FILE_SUMMARY_BY_INSTANCE' already exists
+ERROR 1050 (42S01) at line 213: Table 'MUTEX_INSTANCES' already exists
+ERROR 1050 (42S01) at line 223: Table 'PERFORMANCE_TIMERS' already exists
+ERROR 1050 (42S01) at line 233: Table 'RWLOCK_INSTANCES' already exists
+ERROR 1050 (42S01) at line 243: Table 'SETUP_ACTORS' already exists
+ERROR 1050 (42S01) at line 251: Table 'SETUP_CONSUMERS' already exists
+ERROR 1050 (42S01) at line 260: Table 'SETUP_INSTRUMENTS' already exists
+ERROR 1050 (42S01) at line 268: Table 'SETUP_TIMERS' already exists
+ERROR 1050 (42S01) at line 288: Table 'THREADS' already exists
+ERROR 1644 (HY000) at line 706: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name
=== modified file 'mysql-test/suite/perfschema/r/short_option_1.result'
--- a/mysql-test/suite/perfschema/r/short_option_1.result 2010-08-26 00:59:28 +0000
+++ b/mysql-test/suite/perfschema/r/short_option_1.result 2010-11-02 11:53:54 +0000
@@ -15,7 +15,6 @@ Variable_name Value
character_set_system utf8
show variables like 'log';
Variable_name Value
-log ON
show variables like 'general_log';
Variable_name Value
general_log ON
=== modified file 'mysql-test/suite/perfschema/t/no_threads-master.opt'
--- a/mysql-test/suite/perfschema/t/no_threads-master.opt 2010-06-22 10:13:47 +0000
+++ b/mysql-test/suite/perfschema/t/no_threads-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb
+--thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb
=== modified file 'mysql-test/suite/perfschema/t/short_option_1-master.opt'
--- a/mysql-test/suite/perfschema/t/short_option_1-master.opt 2010-08-26 00:59:28 +0000
+++ b/mysql-test/suite/perfschema/t/short_option_1-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
--a -n -Cutf8 --collation=utf8_bin -l -T12 -W3
+-a -n -Cutf8 --collation=utf8_bin -T12 -W3
=== modified file 'mysql-test/suite/rpl/r/rpl_charset.result'
--- a/mysql-test/suite/rpl/r/rpl_charset.result 2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_charset.result 2010-11-02 11:53:54 +0000
@@ -101,22 +101,6 @@ set global character_set_server=latin2;
set global character_set_server=latin1;
set global character_set_server=latin2;
set global character_set_server=latin1;
-set one_shot @@character_set_server=latin5;
-set @@max_join_size=1000;
-select @@character_set_server;
-@@character_set_server
-latin5
-select @@character_set_server;
-@@character_set_server
-latin1
-set @@character_set_server=latin5;
-select @@character_set_server;
-@@character_set_server
-latin5
-select @@character_set_server;
-@@character_set_server
-latin5
-set one_shot max_join_size=1000000;
set character_set_client=9999999;
ERROR 42000: Unknown character set: '9999999'
set collation_server=9999998;
=== modified file 'mysql-test/suite/rpl/r/rpl_replicate_do.result'
--- a/mysql-test/suite/rpl/r/rpl_replicate_do.result 2010-08-05 17:45:25 +0000
+++ b/mysql-test/suite/rpl/r/rpl_replicate_do.result 2010-11-02 11:53:54 +0000
@@ -27,18 +27,6 @@ select * from t11;
ERROR 42S02: Table 'test.t11' doesn't exist
drop table if exists t1,t2,t11;
Replicate_Do_Table test.t1
-create table t1 (ts timestamp);
-set one_shot time_zone='met';
-insert into t1 values('2005-08-12 00:00:00');
-set one_shot time_zone='met';
-select * from t1;
-ts
-2005-08-12 00:00:00
-set one_shot time_zone='met';
-select * from t1;
-ts
-2005-08-12 00:00:00
-drop table t1;
*** master ***
create table t1 (a int, b int);
create trigger trg1 before insert on t1 for each row set new.b=2;
=== modified file 'mysql-test/suite/rpl/t/rpl_replicate_do.test'
--- a/mysql-test/suite/rpl/t/rpl_replicate_do.test 2010-06-22 09:34:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_replicate_do.test 2010-11-02 11:53:54 +0000
@@ -29,27 +29,6 @@ sync_slave_with_master;
# show slave status, just to see of it prints replicate-do-table
let $status_items= Replicate_Do_Table;
source include/show_slave_status.inc;
-#
-# BUG#12542
-# TEST: "SET ONE_SHOT should always be executed on slave"
-#
-# We could use any timezone different than server default in this test
-#
-connection master;
-create table t1 (ts timestamp);
-set one_shot time_zone='met';
-insert into t1 values('2005-08-12 00:00:00');
-set one_shot time_zone='met';
-select * from t1;
-sync_slave_with_master;
-
-connection slave;
-set one_shot time_zone='met';
-select * from t1;
-
-connection master;
-drop table t1;
-sync_slave_with_master;
# End of 4.1 tests
=== modified file 'mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt 2010-03-20 09:35:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---force-restart --log-slow-slave-statements --log-slow-queries
+--force-restart --log-slow-slave-statements --slow-query-log
=== removed file 'mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result'
--- a/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result 1970-01-01 00:00:00 +0000
@@ -1,290 +0,0 @@
-SET @session_start_value = @@session.engine_condition_pushdown;
-SELECT @session_start_value;
-@session_start_value
-1
-SET @global_start_value = @@global.engine_condition_pushdown;
-SELECT @global_start_value;
-@global_start_value
-1
-select @old_session_opt_switch:=@@session.optimizer_switch,
-@old_global_opt_switch:=@@global.optimizer_switch;
-@old_session_opt_switch:=@@session.optimizer_switch @old_global_opt_switch:=@@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
-'#--------------------FN_DYNVARS_028_01------------------------#'
-SET @@session.engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SET @@session.engine_condition_pushdown = DEFAULT;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-1
-SET @@global.engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SET @@global.engine_condition_pushdown = DEFAULT;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-1
-'#---------------------FN_DYNVARS_028_02-------------------------#'
-SET engine_condition_pushdown = 1;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@engine_condition_pushdown;
-@@engine_condition_pushdown
-1
-SELECT session.engine_condition_pushdown;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT local.engine_condition_pushdown;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT global.engine_condition_pushdown;
-ERROR 42S02: Unknown table 'global' in field list
-SET session engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-0
-SET global engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-0
-'#--------------------FN_DYNVARS_028_03------------------------#'
-SET @@session.engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-0
-SET @@session.engine_condition_pushdown = 1;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-1
-SET @@global.engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-0
-SET @@global.engine_condition_pushdown = 1;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-1
-'#--------------------FN_DYNVARS_028_04-------------------------#'
-SET @@session.engine_condition_pushdown = -1;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '-1'
-SET @@session.engine_condition_pushdown = 1.6;
-ERROR 42000: Incorrect argument type to variable 'engine_condition_pushdown'
-SET @@session.engine_condition_pushdown = "T";
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'T'
-SET @@session.engine_condition_pushdown = "Y";
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'Y'
-SET @@session.engine_condition_pushdown = TR�E;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'TR�E'
-SET @@session.engine_condition_pushdown = �N;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '�N'
-SET @@session.engine_condition_pushdown = OF;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'OF'
-SET @@session.engine_condition_pushdown = �FF;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '�FF'
-SET @@global.engine_condition_pushdown = -1;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '-1'
-SET @@global.engine_condition_pushdown = 2;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '2'
-SET @@global.engine_condition_pushdown = "T";
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'T'
-SET @@global.engine_condition_pushdown = "Y";
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'Y'
-SET @@global.engine_condition_pushdown = TR�E;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'TR�E'
-SET @@global.engine_condition_pushdown = �N;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '�N'
-SET @@global.engine_condition_pushdown = OF;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'OF'
-SET @@global.engine_condition_pushdown = �FF;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '�FF'
-'#-------------------FN_DYNVARS_028_05----------------------------#'
-SET @@global.engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SET @@session.engine_condition_pushdown = 1;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown AS res_is_0;
-res_is_0
-0
-SET @@global.engine_condition_pushdown = 0;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown AS res_is_1;
-res_is_1
-1
-'#----------------------FN_DYNVARS_028_06------------------------#'
-SELECT IF(@@global.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-IF(@@global.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE
-1
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-0
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-VARIABLE_VALUE
-OFF
-'#----------------------FN_DYNVARS_028_07------------------------#'
-SELECT IF(@@session.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-IF(@@session.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE
-1
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-1
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-VARIABLE_VALUE
-ON
-'#---------------------FN_DYNVARS_028_08-------------------------#'
-SET @@session.engine_condition_pushdown = OFF;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-0
-SET @@session.engine_condition_pushdown = ON;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-1
-SET @@global.engine_condition_pushdown = OFF;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-0
-SET @@global.engine_condition_pushdown = ON;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-1
-'#---------------------FN_DYNVARS_028_09----------------------#'
-SET @@session.engine_condition_pushdown = TRUE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-1
-SET @@session.engine_condition_pushdown = FALSE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-0
-SET @@global.engine_condition_pushdown = TRUE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-1
-SET @@global.engine_condition_pushdown = FALSE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-0
-Check that @@engine_condition_pushdown influences
-@@optimizer_switch and vice-versa
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
-set @@session.engine_condition_pushdown = TRUE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-1 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
-set @@session.engine_condition_pushdown = FALSE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
-set @@global.engine_condition_pushdown = TRUE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 1 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
-set @@global.engine_condition_pushdown = FALSE;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
-set @@session.optimizer_switch = "engine_condition_pushdown=on";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-1 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
-set @@session.optimizer_switch = "engine_condition_pushdown=off";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
-set @@global.optimizer_switch = "engine_condition_pushdown=on";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 1 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
-set @@global.optimizer_switch = "engine_condition_pushdown=off";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off
-SET @@session.engine_condition_pushdown = @session_start_value;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-1
-SET @@global.engine_condition_pushdown = @global_start_value;
-Warnings:
-Warning 1287 '@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-1
-set @session.optimizer_switch=@old_session_opt_switch,
-@@global.optimizer_switch=@old_global_opt_switch;
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-@@session.engine_condition_pushdown @@global.engine_condition_pushdown @@session.optimizer_switch @@global.optimizer_switch
-1 1 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
=== removed file 'mysql-test/suite/sys_vars/r/have_csv_basic.result'
--- a/mysql-test/suite/sys_vars/r/have_csv_basic.result 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/have_csv_basic.result 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_008_01----------------------#'
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-'#---------------------BS_STVARS_008_02----------------------#'
-SET @@GLOBAL.have_csv=1;
-ERROR HY000: Variable 'have_csv' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-'#---------------------BS_STVARS_008_03----------------------#'
-SELECT @@GLOBAL.have_csv = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_csv';
-@@GLOBAL.have_csv = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_csv';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_008_04----------------------#'
-SELECT @@have_csv = @@GLOBAL.have_csv;
-@@have_csv = @@GLOBAL.have_csv
-1
-1 Expected
-'#---------------------BS_STVARS_008_05----------------------#'
-SELECT COUNT(@@have_csv);
-COUNT(@@have_csv)
-1
-1 Expected
-SELECT COUNT(@@local.have_csv);
-ERROR HY000: Variable 'have_csv' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.have_csv);
-ERROR HY000: Variable 'have_csv' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-SELECT have_csv = @@SESSION.have_csv;
-ERROR 42S22: Unknown column 'have_csv' in 'field list'
-Expected error 'Readonly variable'
=== removed file 'mysql-test/suite/sys_vars/r/have_innodb_basic.result'
--- a/mysql-test/suite/sys_vars/r/have_innodb_basic.result 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/have_innodb_basic.result 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_011_01----------------------#'
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-'#---------------------BS_STVARS_011_02----------------------#'
-SET @@GLOBAL.have_innodb=1;
-ERROR HY000: Variable 'have_innodb' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-'#---------------------BS_STVARS_011_03----------------------#'
-SELECT @@GLOBAL.have_innodb = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_innodb';
-@@GLOBAL.have_innodb = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_innodb';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_011_04----------------------#'
-SELECT @@have_innodb = @@GLOBAL.have_innodb;
-@@have_innodb = @@GLOBAL.have_innodb
-1
-1 Expected
-'#---------------------BS_STVARS_011_05----------------------#'
-SELECT COUNT(@@have_innodb);
-COUNT(@@have_innodb)
-1
-1 Expected
-SELECT COUNT(@@local.have_innodb);
-ERROR HY000: Variable 'have_innodb' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.have_innodb);
-ERROR HY000: Variable 'have_innodb' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-SELECT have_innodb = @@SESSION.have_innodb;
-ERROR 42S22: Unknown column 'have_innodb' in 'field list'
-Expected error 'Readonly variable'
=== removed file 'mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result'
--- a/mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_012_01----------------------#'
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
-COUNT(@@GLOBAL.have_ndbcluster)
-1
-1 Expected
-'#---------------------BS_STVARS_012_02----------------------#'
-SET @@GLOBAL.have_ndbcluster=1;
-ERROR HY000: Variable 'have_ndbcluster' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
-COUNT(@@GLOBAL.have_ndbcluster)
-1
-1 Expected
-'#---------------------BS_STVARS_012_03----------------------#'
-SELECT @@GLOBAL.have_ndbcluster = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_ndbcluster';
-@@GLOBAL.have_ndbcluster = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
-COUNT(@@GLOBAL.have_ndbcluster)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_ndbcluster';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_012_04----------------------#'
-SELECT @@have_ndbcluster = @@GLOBAL.have_ndbcluster;
-@@have_ndbcluster = @@GLOBAL.have_ndbcluster
-1
-1 Expected
-'#---------------------BS_STVARS_012_05----------------------#'
-SELECT COUNT(@@have_ndbcluster);
-COUNT(@@have_ndbcluster)
-1
-1 Expected
-SELECT COUNT(@@local.have_ndbcluster);
-ERROR HY000: Variable 'have_ndbcluster' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.have_ndbcluster);
-ERROR HY000: Variable 'have_ndbcluster' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
-COUNT(@@GLOBAL.have_ndbcluster)
-1
-1 Expected
-SELECT have_ndbcluster = @@SESSION.have_ndbcluster;
-ERROR 42S22: Unknown column 'have_ndbcluster' in 'field list'
-Expected error 'Readonly variable'
=== removed file 'mysql-test/suite/sys_vars/r/have_partitioning_basic.result'
--- a/mysql-test/suite/sys_vars/r/have_partitioning_basic.result 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/have_partitioning_basic.result 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_014_01----------------------#'
-SELECT COUNT(@@GLOBAL.have_partitioning);
-COUNT(@@GLOBAL.have_partitioning)
-1
-1 Expected
-'#---------------------BS_STVARS_014_02----------------------#'
-SET @@GLOBAL.have_partitioning=1;
-ERROR HY000: Variable 'have_partitioning' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.have_partitioning);
-COUNT(@@GLOBAL.have_partitioning)
-1
-1 Expected
-'#---------------------BS_STVARS_014_03----------------------#'
-SELECT @@GLOBAL.have_partitioning = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_partitioning';
-@@GLOBAL.have_partitioning = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.have_partitioning);
-COUNT(@@GLOBAL.have_partitioning)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_partitioning';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_014_04----------------------#'
-SELECT @@have_partitioning = @@GLOBAL.have_partitioning;
-@@have_partitioning = @@GLOBAL.have_partitioning
-1
-1 Expected
-'#---------------------BS_STVARS_014_05----------------------#'
-SELECT COUNT(@@have_partitioning);
-COUNT(@@have_partitioning)
-1
-1 Expected
-SELECT COUNT(@@local.have_partitioning);
-ERROR HY000: Variable 'have_partitioning' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.have_partitioning);
-ERROR HY000: Variable 'have_partitioning' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.have_partitioning);
-COUNT(@@GLOBAL.have_partitioning)
-1
-1 Expected
-SELECT have_partitioning = @@SESSION.have_partitioning;
-ERROR 42S22: Unknown column 'have_partitioning' in 'field list'
-Expected error 'Readonly variable'
=== removed file 'mysql-test/suite/sys_vars/r/log_basic.result'
--- a/mysql-test/suite/sys_vars/r/log_basic.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/log_basic.result 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-'#--------------------FN_DYNVARS_062_01------------------#'
-SET @start_log= @@global.log;
-SELECT @@global.log AS INIT_VALUE;
-INIT_VALUE
-1
-SELECT @@log AS INIT_VALUE;
-INIT_VALUE
-1
-SET @@global.log = ON;
-Warnings:
-Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead
-SET global log = 0;
-Warnings:
-Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead
-'#--------------------FN_DYNVARS_062_02-------------------------#'
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log';
-VARIABLE_VALUE
-OFF
-SET @@global.log= @start_log;
-Warnings:
-Warning 1287 '@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead
=== removed file 'mysql-test/suite/sys_vars/r/log_slow_queries_basic.result'
--- a/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result 1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-SET @start_value = @@global.log_slow_queries;
-SELECT @start_value;
-@start_value
-1
-'#---------------------FN_DYNVARS_004_01-------------------------#'
-SET @@global.log_slow_queries = DEFAULT;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries = 0;
-@@global.log_slow_queries = 0
-1
-'#--------------------FN_DYNVARS_004_02------------------------#'
-SET @@global.log_slow_queries = ON;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
-SET @@global.log_slow_queries = OFF;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-0
-'#--------------------FN_DYNVARS_004_03-------------------------#'
-SET @@global.log_slow_queries = 2;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of '2'
-SET @@global.log_slow_queries = -1;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of '-1'
-SET @@global.log_slow_queries = TRUEF;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'TRUEF'
-SET @@global.log_slow_queries = TRUE_F;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'TRUE_F'
-SET @@global.log_slow_queries = FALSE0;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'FALSE0'
-SET @@global.log_slow_queries = OON;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'OON'
-SET @@global.log_slow_queries = ONN;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'ONN'
-SET @@global.log_slow_queries = OOFF;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'OOFF'
-SET @@global.log_slow_queries = 0FF;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of '0FF'
-SET @@global.log_slow_queries = ' ';
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of ' '
-SET @@global.log_slow_queries = " ";
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of ' '
-SET @@global.log_slow_queries = '';
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of ''
-'#-------------------FN_DYNVARS_004_04----------------------------#'
-SET @@session.log_slow_queries = OFF;
-ERROR HY000: Variable 'log_slow_queries' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.log_slow_queries;
-ERROR HY000: Variable 'log_slow_queries' is a GLOBAL variable
-'#----------------------FN_DYNVARS_004_05------------------------#'
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_004_06----------------------#'
-SET @@global.log_slow_queries = 0;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-0
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-SET @@global.log_slow_queries = 1;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_004_07----------------------#'
-SET @@global.log_slow_queries = TRUE;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-SET @@global.log_slow_queries = FALSE;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-0
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_004_08----------------------#'
-SET @@global.log_slow_queries = ON;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@log_slow_queries = @@global.log_slow_queries;
-@@log_slow_queries = @@global.log_slow_queries
-1
-'#---------------------FN_DYNVARS_004_09----------------------#'
-SET log_slow_queries = ON;
-ERROR HY000: Variable 'log_slow_queries' is a GLOBAL variable and should be set with SET GLOBAL
-SET local.log_slow_queries = OFF;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_slow_queries = OFF' at line 1
-SELECT local.log_slow_queries;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.log_slow_queries = ON;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_slow_queries = ON' at line 1
-SELECT global.log_slow_queries;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT log_slow_queries = @@session.log_slow_queries;
-ERROR 42S22: Unknown column 'log_slow_queries' in 'field list'
-SET @@global.log_slow_queries = @start_value;
-Warnings:
-Warning 1287 '@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
=== modified file 'mysql-test/suite/sys_vars/r/sql_big_selects_func.result'
--- a/mysql-test/suite/sys_vars/r/sql_big_selects_func.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result 2010-11-02 11:53:54 +0000
@@ -3,9 +3,7 @@
SET @session_sql_big_selects = @@SESSION.sql_big_selects;
SET @session_max_join_size = @@SESSION.max_join_size;
SET @global_max_join_size = @@GLOBAL.max_join_size;
-SET SQL_MAX_JOIN_SIZE=9;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
+SET MAX_JOIN_SIZE=9;
CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20));
CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20));
INSERT INTO t1 VALUES('aa','bb');
=== removed file 'mysql-test/suite/sys_vars/r/sql_big_tables_basic.result'
--- a/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result 1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-SET @session_start_value = @@session.sql_big_tables;
-SELECT @session_start_value;
-@session_start_value
-0
-'#--------------------FN_DYNVARS_154_01------------------------#'
-SET @@session.sql_big_tables = 0;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SET @@session.sql_big_tables = DEFAULT;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-0
-SET @@session.sql_big_tables = 1;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SET @@session.sql_big_tables = DEFAULT;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-0
-'#---------------------FN_DYNVARS_154_02-------------------------#'
-SET sql_big_tables = 1;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@sql_big_tables;
-@@sql_big_tables
-1
-SELECT session.sql_big_tables;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT local.sql_big_tables;
-ERROR 42S02: Unknown table 'local' in field list
-SET session sql_big_tables = 0;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-0
-'#--------------------FN_DYNVARS_154_03------------------------#'
-SET @@session.sql_big_tables = 0;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-0
-SET @@session.sql_big_tables = 1;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-1
-'#--------------------FN_DYNVARS_154_04-------------------------#'
-SET @@session.sql_big_tables = -1;
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of '-1'
-SET @@session.sql_big_tables = 2;
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of '2'
-SET @@session.sql_big_tables = "T";
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'T'
-SET @@session.sql_big_tables = "Y";
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'Y'
-SET @@session.sql_big_tables = TR�E;
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'TR�E'
-SET @@session.sql_big_tables = �N;
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of '�N'
-SET @@session.sql_big_tables = OF;
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'OF'
-SET @@session.sql_big_tables = �FF;
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of '�FF'
-SET @@session.sql_big_tables = '�';
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of '�'
-SET @@session.sql_big_tables = NO;
-ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'NO'
-'#-------------------FN_DYNVARS_154_05----------------------------#'
-SET @@global.sql_big_tables = 1-@@global.sql_big_tables;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@global.sql_big_tables;
-@@global.sql_big_tables
-1
-SET @@global.sql_big_tables = 1-@@global.sql_big_tables;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@global.sql_big_tables;
-@@global.sql_big_tables
-0
-'#----------------------FN_DYNVARS_154_06------------------------#'
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='sql_big_tables';
-count(VARIABLE_VALUE)
-1
-'#----------------------FN_DYNVARS_154_07------------------------#'
-SELECT IF(@@session.sql_big_tables, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_big_tables';
-IF(@@session.sql_big_tables, "ON", "OFF") = VARIABLE_VALUE
-1
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-1
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_big_tables';
-VARIABLE_VALUE
-ON
-'#---------------------FN_DYNVARS_154_08-------------------------#'
-SET @@session.sql_big_tables = OFF;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-0
-SET @@session.sql_big_tables = ON;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-1
-'#---------------------FN_DYNVARS_154_09----------------------#'
-SET @@session.sql_big_tables = TRUE;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-1
-SET @@session.sql_big_tables = FALSE;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-0
-SET @@session.sql_big_tables = @session_start_value;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SELECT @@session.sql_big_tables;
-@@session.sql_big_tables
-0
=== removed file 'mysql-test/suite/sys_vars/r/sql_big_tables_func.result'
--- a/mysql-test/suite/sys_vars/r/sql_big_tables_func.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_big_tables_func.result 1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-** Setup **
-
-SET @old_big_tables = @@SESSION.sql_big_tables;
-CREATE TABLE t1(a varchar(20), b varchar(20));
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-'#--------------------FN_DYNVARS_155_01-------------------------#'
-SET SESSION sql_big_tables = 1;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SET @diskTableCount = 0;
-SET @tempTableCount = 0;
-SELECT * FROM (SELECT ta.a as a, tb.b as b
-FROM t1 as ta INNER JOIN t1 as tb ON ta.a = tb.a) sub;
-a b
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-aa bb
-SET @diskTableCount = 1 - @diskTableCount;
-SET @tempTableCount = 1 - @tempTableCount;
-SELECT @diskTableCount;
-@diskTableCount
-1
-1 Expected
-SELECT @tempTableCount;
-@tempTableCount
-1
-1 Expected
-'#--------------------FN_DYNVARS_155_02-------------------------#'
-SET SESSION sql_big_tables = 0;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-SET @diskTableCount = 1;
-SET @tempTableCount = 1;
-SELECT * FROM (SELECT ta.b as a, tb.a as b FROM t1 as ta INNER JOIN t1 as tb ON ta.a = tb.a) sub;
-a b
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-bb aa
-SET @diskTableCount = 1 - @diskTableCount;
-SET @tempTableCount = 2 - @tempTableCount;
-SELECT @diskTableCount;
-@diskTableCount
-0
-0 Expected
-SELECT @tempTableCount;
-@tempTableCount
-1
-1 Expected
-'#--------------------FN_DYNVARS_155_03-------------------------#'
-** Connecting con_int1 using root **
-** Connection con_int1 **
-SELECT @@SESSION.sql_big_tables;
-@@SESSION.sql_big_tables
-0
-0 / FALSE Expected;
-SET SESSION sql_big_tables = FALSE;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-** Connecting con_int2 using root **
-** Connection con_int2 **
-SELECT @@SESSION.sql_big_tables;
-@@SESSION.sql_big_tables
-0
-0 / FALSE Expected;
-SET SESSION sql_big_tables = TRUE;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-** Connection con_int1 **
-SELECT @@SESSION.sql_big_tables;
-@@SESSION.sql_big_tables
-0
-0 / FALSE Expected;
-** Connection con_int2 **
-SELECT @@SESSION.sql_big_tables;
-@@SESSION.sql_big_tables
-1
-1 / TRUE Expected;
-** Connection default **
-Disconnecting Connections con_int1, con_int2
-SET SESSION sql_big_tables = @old_big_tables;
-Warnings:
-Warning 1287 '@@sql_big_tables' is deprecated and will be removed in a future release. Please use @@big_tables instead
-DROP TABLE t1;
=== removed file 'mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result'
--- a/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result 1970-01-01 00:00:00 +0000
@@ -1,213 +0,0 @@
-SET @session_start_value = @@session.sql_low_priority_updates;
-SELECT @session_start_value;
-@session_start_value
-0
-SET @global_start_value = @@global.sql_low_priority_updates;
-SELECT @global_start_value;
-@global_start_value
-0
-'#--------------------FN_DYNVARS_159_01------------------------#'
-SET @@session.sql_low_priority_updates = 1;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SET @@session.sql_low_priority_updates = DEFAULT;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-0
-SET @@global.sql_low_priority_updates = 1;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SET @@global.sql_low_priority_updates = DEFAULT;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-'#---------------------FN_DYNVARS_159_02-------------------------#'
-SET sql_low_priority_updates = 1;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@sql_low_priority_updates;
-@@sql_low_priority_updates
-1
-SELECT session.sql_low_priority_updates;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT local.sql_low_priority_updates;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT global.sql_low_priority_updates;
-ERROR 42S02: Unknown table 'global' in field list
-SET session sql_low_priority_updates = 0;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-0
-SET global sql_low_priority_updates = 0;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-0
-'#--------------------FN_DYNVARS_159_03------------------------#'
-SET @@session.sql_low_priority_updates = 0;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-0
-SET @@session.sql_low_priority_updates = 1;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-1
-SET @@global.sql_low_priority_updates = 0;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-0
-SET @@global.sql_low_priority_updates = 1;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-1
-'#--------------------FN_DYNVARS_159_04-------------------------#'
-SET @@session.sql_low_priority_updates = -1;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of '-1'
-SET @@session.sql_low_priority_updates = 1.6;
-ERROR 42000: Incorrect argument type to variable 'sql_low_priority_updates'
-SET @@session.sql_low_priority_updates = "T";
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'T'
-SET @@session.sql_low_priority_updates = "Y";
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'Y'
-SET @@session.sql_low_priority_updates = TR�E;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'TR�E'
-SET @@session.sql_low_priority_updates = �N;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of '�N'
-SET @@session.sql_low_priority_updates = OF;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'OF'
-SET @@session.sql_low_priority_updates = �FF;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of '�FF'
-SET @@global.sql_low_priority_updates = -1;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of '-1'
-SET @@global.sql_low_priority_updates = 2;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of '2'
-SET @@global.sql_low_priority_updates = "T";
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'T'
-SET @@global.sql_low_priority_updates = "Y";
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'Y'
-SET @@global.sql_low_priority_updates = TR�E;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'TR�E'
-SET @@global.sql_low_priority_updates = �N;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of '�N'
-SET @@global.sql_low_priority_updates = OF;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'OF'
-SET @@global.sql_low_priority_updates = �FF;
-ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of '�FF'
-'#-------------------FN_DYNVARS_159_05----------------------------#'
-SET @@global.sql_low_priority_updates = 0;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SET @@session.sql_low_priority_updates = 1;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates AS res_is_0;
-res_is_0
-0
-SET @@global.sql_low_priority_updates = 0;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates AS res_is_1;
-res_is_1
-1
-'#----------------------FN_DYNVARS_159_06------------------------#'
-SELECT IF(@@global.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-IF(@@global.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE
-1
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-0
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-VARIABLE_VALUE
-OFF
-'#----------------------FN_DYNVARS_159_07------------------------#'
-SELECT IF(@@session.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-IF(@@session.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE
-1
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-1
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-VARIABLE_VALUE
-ON
-'#---------------------FN_DYNVARS_159_08-------------------------#'
-SET @@session.sql_low_priority_updates = OFF;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-0
-SET @@session.sql_low_priority_updates = ON;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-1
-SET @@global.sql_low_priority_updates = OFF;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-0
-SET @@global.sql_low_priority_updates = ON;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-1
-'#---------------------FN_DYNVARS_159_09----------------------#'
-SET @@session.sql_low_priority_updates = TRUE;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-1
-SET @@session.sql_low_priority_updates = FALSE;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-0
-SET @@global.sql_low_priority_updates = TRUE;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-1
-SET @@global.sql_low_priority_updates = FALSE;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-0
-SET @@session.sql_low_priority_updates = @session_start_value;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@session.sql_low_priority_updates;
-@@session.sql_low_priority_updates
-0
-SET @@global.sql_low_priority_updates = @global_start_value;
-Warnings:
-Warning 1287 '@@sql_low_priority_updates' is deprecated and will be removed in a future release. Please use @@low_priority_updates instead
-SELECT @@global.sql_low_priority_updates;
-@@global.sql_low_priority_updates
-0
=== removed file 'mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result 1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-SET @start_global_value = @@global.sql_max_join_size;
-SELECT @start_global_value;
-@start_global_value
-18446744073709551615
-select @@global.sql_max_join_size;
-@@global.sql_max_join_size
-18446744073709551615
-select @@session.sql_max_join_size;
-@@session.sql_max_join_size
-18446744073709551615
-show global variables like 'sql_max_join_size';
-Variable_name Value
-sql_max_join_size 18446744073709551615
-show session variables like 'sql_max_join_size';
-Variable_name Value
-sql_max_join_size 18446744073709551615
-select * from information_schema.global_variables where variable_name='sql_max_join_size';
-VARIABLE_NAME VARIABLE_VALUE
-SQL_MAX_JOIN_SIZE 18446744073709551615
-select * from information_schema.session_variables where variable_name='sql_max_join_size';
-VARIABLE_NAME VARIABLE_VALUE
-SQL_MAX_JOIN_SIZE 18446744073709551615
-set global sql_max_join_size=10;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-set session sql_max_join_size=20;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-select @@global.sql_max_join_size;
-@@global.sql_max_join_size
-10
-select @@session.sql_max_join_size;
-@@session.sql_max_join_size
-20
-show global variables like 'sql_max_join_size';
-Variable_name Value
-sql_max_join_size 10
-show session variables like 'sql_max_join_size';
-Variable_name Value
-sql_max_join_size 20
-select * from information_schema.global_variables where variable_name='sql_max_join_size';
-VARIABLE_NAME VARIABLE_VALUE
-SQL_MAX_JOIN_SIZE 10
-select * from information_schema.session_variables where variable_name='sql_max_join_size';
-VARIABLE_NAME VARIABLE_VALUE
-SQL_MAX_JOIN_SIZE 20
-set global sql_max_join_size=1.1;
-ERROR 42000: Incorrect argument type to variable 'sql_max_join_size'
-set global sql_max_join_size=1e1;
-ERROR 42000: Incorrect argument type to variable 'sql_max_join_size'
-set global sql_max_join_size="foo";
-ERROR 42000: Incorrect argument type to variable 'sql_max_join_size'
-select @@sql_big_selects;
-@@sql_big_selects
-0
-set sql_max_join_size=cast(-1 as unsigned int);
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-select @@sql_big_selects;
-@@sql_big_selects
-1
-set sql_max_join_size=100;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-select @@sql_big_selects;
-@@sql_big_selects
-0
-SET @@global.sql_max_join_size = @start_global_value;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-SELECT @@global.sql_max_join_size;
-@@global.sql_max_join_size
-18446744073709551615
=== removed file 'mysql-test/suite/sys_vars/r/sql_max_join_size_func.result'
--- a/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result 2010-10-25 09:20:53 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result 1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-** Setup **
-SET @session_max_join_size = @@SESSION.sql_max_join_size;
-SET @global_max_join_size = @@GLOBAL.sql_max_join_size;
-SET @session_sql_big_selects = @@SESSION.sql_big_selects;
-CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20));
-CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20));
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa1','bb');
-INSERT INTO t1 VALUES('aa2','bb');
-INSERT INTO t1 VALUES('aa3','bb');
-INSERT INTO t1 VALUES('aa4','bb');
-INSERT INTO t2 VALUES('aa','bb');
-INSERT INTO t2 VALUES('aa1','bb');
-INSERT INTO t2 VALUES('aa2','bb');
-INSERT INTO t2 VALUES('aa3','bb');
-INSERT INTO t2 VALUES('aa4','bb');
-'#--------------------FN_DYNVARS_161_01-------------------------#'
-SET SESSION sql_max_join_size=9;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
-ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay
-Expected error The SELECT would examine more than MAX_JOIN_SIZE rows.
-'#--------------------FN_DYNVARS_161_02-------------------------#'
-SET SESSION SQL_BIG_SELECTS = 1;
-SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
-a b a b
-aa bb aa bb
-aa1 bb aa1 bb
-aa2 bb aa2 bb
-aa3 bb aa3 bb
-aa4 bb aa4 bb
-This should work
-SET SESSION sql_max_join_size=DEFAULT;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-DELETE FROM t2 WHERE a = 'aa4';
-SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
-a b a b
-aa bb aa bb
-aa1 bb aa1 bb
-aa2 bb aa2 bb
-aa3 bb aa3 bb
-This should work
-'#----------------------------FN_DYNVARS_136_05-------------------------#'
-SET GLOBAL sql_max_join_size = 4;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-** Connecting con_int1 using root **
-** Connection con_int1 **
-SELECT @@SESSION.sql_max_join_size;
-@@SESSION.sql_max_join_size
-4
-4 Expected
-SET SESSION sql_max_join_size = 2;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-** Connecting con_int2 using root **
-** Connection con_int2 **
-SELECT @@SESSION.sql_max_join_size;
-@@SESSION.sql_max_join_size
-4
-4 Expected
-SET SESSION sql_max_join_size = 10;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-** Connection con_int2 **
-SELECT @@SESSION.sql_max_join_size;
-@@SESSION.sql_max_join_size
-10
-10 Expected
-** Connection con_int1 **
-SELECT @@SESSION.sql_max_join_size;
-@@SESSION.sql_max_join_size
-2
-2 Expected
-SELECT @@GLOBAL.sql_max_join_size;
-@@GLOBAL.sql_max_join_size
-4
-4 Expected
-** Connection default **
-Disconnecting Connections con_int1, con_int2
-SET @@SESSION.sql_max_join_size = @session_max_join_size;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-SET @@GLOBAL.sql_max_join_size = @global_max_join_size ;
-Warnings:
-Warning 1287 '@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
-SET @@SESSION.sql_big_selects = @session_sql_big_selects;
-DROP TABLE t1;
-DROP TABLE t2;
=== removed file 'mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test'
--- a/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test 2010-01-06 10:54:45 +0000
+++ b/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test 1970-01-01 00:00:00 +0000
@@ -1,267 +0,0 @@
-############## mysql-test\t\engine_condition_pushdown_basic.test ##############
-# #
-# Variable Name: engine_condition_pushdown #
-# Scope: GLOBAL | SESSION #
-# Access Type: Dynamic #
-# Data Type: boolean #
-# Default Value: OFF #
-# Valid Values: ON, OFF #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable engine_condition_pushdown#
-# that checks the behavior of this variable in the following ways#
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-# START OF engine_condition_pushdown TESTS #
-########################################################################
-
-
-###############################################################################
-# Saving initial value of engine_condition_pushdown in a temporary variable #
-###############################################################################
-
-SET @session_start_value = @@session.engine_condition_pushdown;
-SELECT @session_start_value;
-
-SET @global_start_value = @@global.engine_condition_pushdown;
-SELECT @global_start_value;
-
-# same for optimizer_switch
-select @old_session_opt_switch:=@@session.optimizer_switch,
-@old_global_opt_switch:=@@global.optimizer_switch;
-
---echo '#--------------------FN_DYNVARS_028_01------------------------#'
-########################################################################
-# Display the DEFAULT value of engine_condition_pushdown #
-########################################################################
-
-SET @@session.engine_condition_pushdown = 0;
-SET @@session.engine_condition_pushdown = DEFAULT;
-SELECT @@session.engine_condition_pushdown;
-
-SET @@global.engine_condition_pushdown = 0;
-SET @@global.engine_condition_pushdown = DEFAULT;
-SELECT @@global.engine_condition_pushdown;
-
---echo '#---------------------FN_DYNVARS_028_02-------------------------#'
-###############################################################################
-# Check if engine_condition_pushdown can be accessed with and without @@ sign #
-###############################################################################
-
-SET engine_condition_pushdown = 1;
-SELECT @@engine_condition_pushdown;
-
---Error ER_UNKNOWN_TABLE
-SELECT session.engine_condition_pushdown;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.engine_condition_pushdown;
-
---Error ER_UNKNOWN_TABLE
-SELECT global.engine_condition_pushdown;
-
-SET session engine_condition_pushdown = 0;
-SELECT @@session.engine_condition_pushdown;
-
-SET global engine_condition_pushdown = 0;
-SELECT @@global.engine_condition_pushdown;
-
-
---echo '#--------------------FN_DYNVARS_028_03------------------------#'
-##########################################################################
-# change the value of engine_condition_pushdown to a valid value #
-##########################################################################
-
-SET @@session.engine_condition_pushdown = 0;
-SELECT @@session.engine_condition_pushdown;
-SET @@session.engine_condition_pushdown = 1;
-SELECT @@session.engine_condition_pushdown;
-
-
-SET @@global.engine_condition_pushdown = 0;
-SELECT @@global.engine_condition_pushdown;
-SET @@global.engine_condition_pushdown = 1;
-SELECT @@global.engine_condition_pushdown;
-
-
---echo '#--------------------FN_DYNVARS_028_04-------------------------#'
-###########################################################################
-# Change the value of engine_condition_pushdown to invalid value #
-###########################################################################
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.engine_condition_pushdown = -1;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.engine_condition_pushdown = 1.6;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.engine_condition_pushdown = "T";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.engine_condition_pushdown = "Y";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.engine_condition_pushdown = TR�E;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.engine_condition_pushdown = �N;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.engine_condition_pushdown = OF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.engine_condition_pushdown = �FF;
-
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = -1;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = 2;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = "T";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = "Y";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = TR�E;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = �N;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = OF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.engine_condition_pushdown = �FF;
-
-
---echo '#-------------------FN_DYNVARS_028_05----------------------------#'
-###########################################################################
-# Test if changing global variable effects session and vice versa #
-###########################################################################
-
-SET @@global.engine_condition_pushdown = 0;
-SET @@session.engine_condition_pushdown = 1;
-SELECT @@global.engine_condition_pushdown AS res_is_0;
-
-SET @@global.engine_condition_pushdown = 0;
-SELECT @@session.engine_condition_pushdown AS res_is_1;
-
---echo '#----------------------FN_DYNVARS_028_06------------------------#'
-#########################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#########################################################################
-
-SELECT IF(@@global.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-SELECT @@global.engine_condition_pushdown;
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-
---echo '#----------------------FN_DYNVARS_028_07------------------------#'
-#########################################################################
-# Check if the value in SESSION Table matches value in variable #
-#########################################################################
-
-SELECT IF(@@session.engine_condition_pushdown, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-SELECT @@session.engine_condition_pushdown;
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='engine_condition_pushdown';
-
-
---echo '#---------------------FN_DYNVARS_028_08-------------------------#'
-###################################################################
-# Check if ON and OFF values can be used on variable #
-###################################################################
-
-SET @@session.engine_condition_pushdown = OFF;
-SELECT @@session.engine_condition_pushdown;
-SET @@session.engine_condition_pushdown = ON;
-SELECT @@session.engine_condition_pushdown;
-
-SET @@global.engine_condition_pushdown = OFF;
-SELECT @@global.engine_condition_pushdown;
-SET @@global.engine_condition_pushdown = ON;
-SELECT @@global.engine_condition_pushdown;
-
---echo '#---------------------FN_DYNVARS_028_09----------------------#'
-###################################################################
-# Check if TRUE and FALSE values can be used on variable #
-###################################################################
-
-SET @@session.engine_condition_pushdown = TRUE;
-SELECT @@session.engine_condition_pushdown;
-SET @@session.engine_condition_pushdown = FALSE;
-SELECT @@session.engine_condition_pushdown;
-
-SET @@global.engine_condition_pushdown = TRUE;
-SELECT @@global.engine_condition_pushdown;
-SET @@global.engine_condition_pushdown = FALSE;
-SELECT @@global.engine_condition_pushdown;
-
---echo Check that @@engine_condition_pushdown influences
---echo @@optimizer_switch and vice-versa
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@session.engine_condition_pushdown = TRUE;
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@session.engine_condition_pushdown = FALSE;
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@global.engine_condition_pushdown = TRUE;
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@global.engine_condition_pushdown = FALSE;
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@session.optimizer_switch = "engine_condition_pushdown=on";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@session.optimizer_switch = "engine_condition_pushdown=off";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@global.optimizer_switch = "engine_condition_pushdown=on";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-set @@global.optimizer_switch = "engine_condition_pushdown=off";
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-
-##############################
-# Restore initial value #
-##############################
-
-SET @@session.engine_condition_pushdown = @session_start_value;
-SELECT @@session.engine_condition_pushdown;
-
-SET @@global.engine_condition_pushdown = @global_start_value;
-SELECT @@global.engine_condition_pushdown;
-
-set @session.optimizer_switch=@old_session_opt_switch,
-@@global.optimizer_switch=@old_global_opt_switch;
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
-
-###############################################################
-# END OF engine_condition_pushdown TESTS #
-###############################################################
=== modified file 'mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1,2 @@
---log=test.log
+--general-log
+--general-log-file=test.log
=== modified file 'mysql-test/suite/sys_vars/t/general_log_file_func-master.opt'
--- a/mysql-test/suite/sys_vars/t/general_log_file_func-master.opt 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/general_log_file_func-master.opt 2010-11-02 11:53:54 +0000
@@ -1,2 +1,3 @@
---log=mysql-test.log
+--general-log
+--general-log-file=mysql-test.log
=== removed file 'mysql-test/suite/sys_vars/t/have_csv_basic.test'
--- a/mysql-test/suite/sys_vars/t/have_csv_basic.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/have_csv_basic.test 1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-
-
-################## mysql-test\t\have_csv_basic.test ###########################
-# #
-# Variable Name: have_csv #
-# Scope: Global #
-# Access Type: Static #
-# Data Type: boolean #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author : Sharique Abdullah #
-# #
-# #
-# Description:Test Cases of Dynamic System Variable have_csv #
-# that checks the behavior of this variable in the following ways #
-# * Value Check #
-# * Scope Check #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---echo '#---------------------BS_STVARS_008_01----------------------#'
-####################################################################
-# Displaying default value #
-####################################################################
-SELECT COUNT(@@GLOBAL.have_csv);
---echo 1 Expected
-
-
---echo '#---------------------BS_STVARS_008_02----------------------#'
-####################################################################
-# Check if Value can set #
-####################################################################
-
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@GLOBAL.have_csv=1;
---echo Expected error 'Read only variable'
-
-SELECT COUNT(@@GLOBAL.have_csv);
---echo 1 Expected
-
-
-
-
---echo '#---------------------BS_STVARS_008_03----------------------#'
-#################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#################################################################
-
-SELECT @@GLOBAL.have_csv = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_csv';
---echo 1 Expected
-
-SELECT COUNT(@@GLOBAL.have_csv);
---echo 1 Expected
-
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_csv';
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_008_04----------------------#'
-################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-################################################################################
-SELECT @@have_csv = @@GLOBAL.have_csv;
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_008_05----------------------#'
-################################################################################
-# Check if have_csv can be accessed with and without @@ sign #
-################################################################################
-
-SELECT COUNT(@@have_csv);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.have_csv);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.have_csv);
---echo Expected error 'Variable is a GLOBAL variable'
-
-SELECT COUNT(@@GLOBAL.have_csv);
---echo 1 Expected
-
---Error ER_BAD_FIELD_ERROR
-SELECT have_csv = @@SESSION.have_csv;
---echo Expected error 'Readonly variable'
-
-
=== removed file 'mysql-test/suite/sys_vars/t/have_innodb_basic.test'
--- a/mysql-test/suite/sys_vars/t/have_innodb_basic.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/have_innodb_basic.test 1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-
-
-################## mysql-test\t\have_innodb_basic.test ########################
-# #
-# Variable Name: have_innodb #
-# Scope: Global #
-# Access Type: Static #
-# Data Type: boolean #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author : Sharique Abdullah #
-# #
-# #
-# Description:Test Cases of Dynamic System Variable have_innodb #
-# that checks the behavior of this variable in the following ways #
-# * Value Check #
-# * Scope Check #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---echo '#---------------------BS_STVARS_011_01----------------------#'
-####################################################################
-# Displaying default value #
-####################################################################
-SELECT COUNT(@@GLOBAL.have_innodb);
---echo 1 Expected
-
-
---echo '#---------------------BS_STVARS_011_02----------------------#'
-####################################################################
-# Check if Value can set #
-####################################################################
-
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@GLOBAL.have_innodb=1;
---echo Expected error 'Read only variable'
-
-SELECT COUNT(@@GLOBAL.have_innodb);
---echo 1 Expected
-
-
-
-
---echo '#---------------------BS_STVARS_011_03----------------------#'
-#################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#################################################################
-
-SELECT @@GLOBAL.have_innodb = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_innodb';
---echo 1 Expected
-
-SELECT COUNT(@@GLOBAL.have_innodb);
---echo 1 Expected
-
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_innodb';
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_011_04----------------------#'
-################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-################################################################################
-SELECT @@have_innodb = @@GLOBAL.have_innodb;
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_011_05----------------------#'
-################################################################################
-# Check if have_innodb can be accessed with and without @@ sign #
-################################################################################
-
-SELECT COUNT(@@have_innodb);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.have_innodb);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.have_innodb);
---echo Expected error 'Variable is a GLOBAL variable'
-
-SELECT COUNT(@@GLOBAL.have_innodb);
---echo 1 Expected
-
---Error ER_BAD_FIELD_ERROR
-SELECT have_innodb = @@SESSION.have_innodb;
---echo Expected error 'Readonly variable'
-
-
=== removed file 'mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test'
--- a/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test 1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-
-
-################## mysql-test\t\have_ndbcluster_basic.test ####################
-# #
-# Variable Name: have_ndbcluster #
-# Scope: Global #
-# Access Type: Static #
-# Data Type: boolean #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author : Sharique Abdullah #
-# #
-# #
-# Description:Test Cases of Dynamic System Variable have_ndbcluster #
-# that checks the behavior of this variable in the following ways #
-# * Value Check #
-# * Scope Check #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---echo '#---------------------BS_STVARS_012_01----------------------#'
-####################################################################
-# Displaying default value #
-####################################################################
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
---echo 1 Expected
-
-
---echo '#---------------------BS_STVARS_012_02----------------------#'
-####################################################################
-# Check if Value can set #
-####################################################################
-
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@GLOBAL.have_ndbcluster=1;
---echo Expected error 'Read only variable'
-
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
---echo 1 Expected
-
-
-
-
---echo '#---------------------BS_STVARS_012_03----------------------#'
-#################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#################################################################
-
-SELECT @@GLOBAL.have_ndbcluster = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_ndbcluster';
---echo 1 Expected
-
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
---echo 1 Expected
-
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_ndbcluster';
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_012_04----------------------#'
-################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-################################################################################
-SELECT @@have_ndbcluster = @@GLOBAL.have_ndbcluster;
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_012_05----------------------#'
-################################################################################
-# Check if have_ndbcluster can be accessed with and without @@ sign #
-################################################################################
-
-SELECT COUNT(@@have_ndbcluster);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.have_ndbcluster);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.have_ndbcluster);
---echo Expected error 'Variable is a GLOBAL variable'
-
-SELECT COUNT(@@GLOBAL.have_ndbcluster);
---echo 1 Expected
-
---Error ER_BAD_FIELD_ERROR
-SELECT have_ndbcluster = @@SESSION.have_ndbcluster;
---echo Expected error 'Readonly variable'
-
-
=== removed file 'mysql-test/suite/sys_vars/t/have_partitioning_basic.test'
--- a/mysql-test/suite/sys_vars/t/have_partitioning_basic.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/have_partitioning_basic.test 1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-
-
-################## mysql-test\t\have_partitioning_basic.test ##################
-# #
-# Variable Name: have_partitioning #
-# Scope: Global #
-# Access Type: Static #
-# Data Type: boolean #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author : Sharique Abdullah #
-# #
-# #
-# Description:Test Cases of Dynamic System Variable have_partitioning #
-# that checks the behavior of this variable in the following ways #
-# * Value Check #
-# * Scope Check #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---echo '#---------------------BS_STVARS_014_01----------------------#'
-####################################################################
-# Displaying default value #
-####################################################################
-SELECT COUNT(@@GLOBAL.have_partitioning);
---echo 1 Expected
-
-
---echo '#---------------------BS_STVARS_014_02----------------------#'
-####################################################################
-# Check if Value can set #
-####################################################################
-
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@GLOBAL.have_partitioning=1;
---echo Expected error 'Read only variable'
-
-SELECT COUNT(@@GLOBAL.have_partitioning);
---echo 1 Expected
-
-
-
-
---echo '#---------------------BS_STVARS_014_03----------------------#'
-#################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#################################################################
-
-SELECT @@GLOBAL.have_partitioning = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_partitioning';
---echo 1 Expected
-
-SELECT COUNT(@@GLOBAL.have_partitioning);
---echo 1 Expected
-
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_partitioning';
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_014_04----------------------#'
-################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-################################################################################
-SELECT @@have_partitioning = @@GLOBAL.have_partitioning;
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_014_05----------------------#'
-################################################################################
-# Check if have_partitioning can be accessed with and without @@ sign #
-################################################################################
-
-SELECT COUNT(@@have_partitioning);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.have_partitioning);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.have_partitioning);
---echo Expected error 'Variable is a GLOBAL variable'
-
-SELECT COUNT(@@GLOBAL.have_partitioning);
---echo 1 Expected
-
---Error ER_BAD_FIELD_ERROR
-SELECT have_partitioning = @@SESSION.have_partitioning;
---echo Expected error 'Readonly variable'
-
-
=== removed file 'mysql-test/suite/sys_vars/t/log_basic.test'
--- a/mysql-test/suite/sys_vars/t/log_basic.test 2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/log_basic.test 1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-###################### mysql-test\t\log_basic.test ############################
-# #
-# Variable Name: log_basic #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: string #
-# Default Value: #
-# Range: #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan #
-# #
-# Description: #
-# Test Cases of Dynamic System Variable log that checks the behavior of #
-# this variable in the following ways #
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: #
-# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
-# #
-###############################################################################
-
---source include/load_sysvars.inc
-
-#####################################
-## START OF log TESTS ##
-#####################################
-
---echo '#--------------------FN_DYNVARS_062_01------------------#'
-#############################################################
-# Accessing variable #
-#############################################################
-
-SET @start_log= @@global.log;
-
-SELECT @@global.log AS INIT_VALUE;
-
-SELECT @@log AS INIT_VALUE;
-
-SET @@global.log = ON;
-
-SET global log = 0;
-
---echo '#--------------------FN_DYNVARS_062_02-------------------------#'
-################################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-################################################################################
-# We can only access log value from information schema global_variables table
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log';
-
-SET @@global.log= @start_log;
-
-############################################
-# END OF log TESTS #
-############################################
-
=== removed file 'mysql-test/suite/sys_vars/t/log_slow_queries_basic.test'
--- a/mysql-test/suite/sys_vars/t/log_slow_queries_basic.test 2010-01-29 06:33:00 +0000
+++ b/mysql-test/suite/sys_vars/t/log_slow_queries_basic.test 1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-##################### mysql-test\t\slow_query_log_basic.test ###################
-# #
-# Variable Name: log_slow_queries #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: BOOLEAN #
-# Default Value: OFF #
-# Valid Values: ON, OFF #
-# #
-# #
-# Creation Date: 2008-03-16 #
-# Author: Salman Rawala #
-# #
-# Description: Test Cases of Dynamic System Variable "log_slow_queries" #
-# that checks behavior of this variable in the following ways #
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-options.html#option_mysqld_event-scheduler #
-# #
-# #
-# 2010-01-20 OBN - Added check for variable value matching I_S tables after #
-# variable value change #
-# #
-################################################################################
-
---source include/load_sysvars.inc
-
-###########################################################
-# START OF log_slow_queries TESTS #
-###########################################################
-
-
-######################################################################
-# Saving initial value of log_slow_queries in a temporary variable #
-######################################################################
-
-SET @start_value = @@global.log_slow_queries;
-SELECT @start_value;
-
-
---echo '#---------------------FN_DYNVARS_004_01-------------------------#'
-###############################################
-# Verify default value of variable #
-###############################################
-
-SET @@global.log_slow_queries = DEFAULT;
-SELECT @@global.log_slow_queries = 0;
-
-
---echo '#--------------------FN_DYNVARS_004_02------------------------#'
-######################################################################
-# Change the value of log_slow_queries to a valid value #
-######################################################################
-
-SET @@global.log_slow_queries = ON;
-SELECT @@global.log_slow_queries;
-SET @@global.log_slow_queries = OFF;
-SELECT @@global.log_slow_queries;
-
---echo '#--------------------FN_DYNVARS_004_03-------------------------#'
-######################################################################
-# Change the value of log_slow_queries to invalid value #
-######################################################################
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = 2;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = -1;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = TRUEF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = TRUE_F;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = FALSE0;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = OON;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = ONN;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = OOFF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = 0FF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = ' ';
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = " ";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_slow_queries = '';
-
-
---echo '#-------------------FN_DYNVARS_004_04----------------------------#'
-##################################################################
-# Test if accessing session log_slow_queries gives error #
-##################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET @@session.log_slow_queries = OFF;
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@session.log_slow_queries;
-
-
---echo '#----------------------FN_DYNVARS_004_05------------------------#'
-##############################################################################
-# Check if the value in GLOBAL Tables matches values in variable #
-##############################################################################
-
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-
-
---echo '#---------------------FN_DYNVARS_004_06----------------------#'
-################################################################
-# Check if 0 and 1 values can be used on variable #
-################################################################
-
-SET @@global.log_slow_queries = 0;
-SELECT @@global.log_slow_queries;
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-SET @@global.log_slow_queries = 1;
-SELECT @@global.log_slow_queries;
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-
---echo '#---------------------FN_DYNVARS_004_07----------------------#'
-###################################################################
-# Check if TRUE and FALSE values can be used on variable #
-###################################################################
-
-SET @@global.log_slow_queries = TRUE;
-SELECT @@global.log_slow_queries;
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-SET @@global.log_slow_queries = FALSE;
-SELECT @@global.log_slow_queries;
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='log_slow_queries';
-
---echo '#---------------------FN_DYNVARS_004_08----------------------#'
-##############################################################################
-# Check if accessing variable with SESSION,LOCAL and without SCOPE points #
-# to same session variable #
-##############################################################################
-
-SET @@global.log_slow_queries = ON;
-SELECT @@log_slow_queries = @@global.log_slow_queries;
-
---echo '#---------------------FN_DYNVARS_004_09----------------------#'
-######################################################################
-# Check if log_slow_queries can be accessed with and without @@ sign #
-######################################################################
---Error ER_GLOBAL_VARIABLE
-SET log_slow_queries = ON;
---Error ER_PARSE_ERROR
-SET local.log_slow_queries = OFF;
---Error ER_UNKNOWN_TABLE
-SELECT local.log_slow_queries;
---Error ER_PARSE_ERROR
-SET global.log_slow_queries = ON;
---Error ER_UNKNOWN_TABLE
-SELECT global.log_slow_queries;
---Error ER_BAD_FIELD_ERROR
-SELECT log_slow_queries = @@session.log_slow_queries;
-
-
-
-##############################
-# Restore initial value #
-##############################
-
-SET @@global.log_slow_queries = @start_value;
-SELECT @@global.log_slow_queries;
-
-
-####################################################
-# END OF log_slow_queries TESTS #
-####################################################
=== modified file 'mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt'
--- a/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt 2010-11-02 11:53:54 +0000
@@ -1,2 +1,3 @@
---log --log-bin=mylog.log
+--general-log
+--log-bin=mylog.log
=== modified file 'mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt'
--- a/mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1,2 @@
---log-slow-queries=slowtest.log
+--slow-query-log
+--slow-query-log-file=slowtest.log
=== modified file 'mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt'
--- a/mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt 2010-11-02 11:53:54 +0000
@@ -1,2 +1,3 @@
---log-slow-queries=my_slow_test.log
+--slow-query-log
+--slow-query-log-file=my_slow_test.log
=== modified file 'mysql-test/suite/sys_vars/t/sql_big_selects_func.test'
--- a/mysql-test/suite/sys_vars/t/sql_big_selects_func.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test 2010-11-02 11:53:54 +0000
@@ -28,7 +28,7 @@
SET @session_sql_big_selects = @@SESSION.sql_big_selects;
SET @session_max_join_size = @@SESSION.max_join_size;
SET @global_max_join_size = @@GLOBAL.max_join_size;
-SET SQL_MAX_JOIN_SIZE=9;
+SET MAX_JOIN_SIZE=9;
#
# Create tables
=== removed file 'mysql-test/suite/sys_vars/t/sql_big_tables_basic.test'
--- a/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test 2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test 1970-01-01 00:00:00 +0000
@@ -1,170 +0,0 @@
-###################### mysql-test\t\sql_big_tables_basic.test #################
-# #
-# Variable Name: sql_big_tables #
-# Scope: SESSION #
-# Access Type: Dynamic #
-# Data Type: boolean #
-# Default Value: #
-# Valid Values : 0,1 #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable sql_big_tables #
-# that checks the behavior of this variable in the following ways#
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/load_sysvars.inc
-########################################################################
-# START OF sql_big_tables TESTS #
-########################################################################
-
-
-##############################################################################
-# Saving initial value of sql_big_tables in a temporary variable #
-##############################################################################
-
-SET @session_start_value = @@session.sql_big_tables;
-SELECT @session_start_value;
-
---echo '#--------------------FN_DYNVARS_154_01------------------------#'
-########################################################################
-# Display the DEFAULT value of sql_big_tables #
-########################################################################
-
-SET @@session.sql_big_tables = 0;
-SET @@session.sql_big_tables = DEFAULT;
-SELECT @@session.sql_big_tables;
-
-SET @@session.sql_big_tables = 1;
-SET @@session.sql_big_tables = DEFAULT;
-SELECT @@session.sql_big_tables;
-
-
---echo '#---------------------FN_DYNVARS_154_02-------------------------#'
-#############################################################################
-# Check if sql_big_tables can be accessed with and without @@ sign #
-#############################################################################
-
-SET sql_big_tables = 1;
-SELECT @@sql_big_tables;
-
---Error ER_UNKNOWN_TABLE
-SELECT session.sql_big_tables;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.sql_big_tables;
-
-SET session sql_big_tables = 0;
-SELECT @@session.sql_big_tables;
-
-
---echo '#--------------------FN_DYNVARS_154_03------------------------#'
-########################################################################
-# change the value of sql_big_tables to a valid value #
-########################################################################
-
-SET @@session.sql_big_tables = 0;
-SELECT @@session.sql_big_tables;
-SET @@session.sql_big_tables = 1;
-SELECT @@session.sql_big_tables;
-
-
---echo '#--------------------FN_DYNVARS_154_04-------------------------#'
-###########################################################################
-# Change the value of sql_big_tables to invalid value #
-###########################################################################
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = -1;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = 2;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = "T";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = "Y";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = TR�E;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = �N;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = OF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = �FF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = '�';
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_tables = NO;
-
-
---echo '#-------------------FN_DYNVARS_154_05----------------------------#'
-###########################################################################
-# Test if accessing global sql_big_tables gives error #
-###########################################################################
-
-SET @@global.sql_big_tables = 1-@@global.sql_big_tables;
-SELECT @@global.sql_big_tables;
-SET @@global.sql_big_tables = 1-@@global.sql_big_tables;
-SELECT @@global.sql_big_tables;
-
---echo '#----------------------FN_DYNVARS_154_06------------------------#'
-#########################################################################
-# Check if the value in GLOBAL Table contains variable value #
-#########################################################################
-
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='sql_big_tables';
-
---echo '#----------------------FN_DYNVARS_154_07------------------------#'
-#########################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#########################################################################
-
-SELECT IF(@@session.sql_big_tables, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_big_tables';
-SELECT @@session.sql_big_tables;
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_big_tables';
-
---echo '#---------------------FN_DYNVARS_154_08-------------------------#'
-###################################################################
-# Check if ON and OFF values can be used on variable #
-###################################################################
-
-SET @@session.sql_big_tables = OFF;
-SELECT @@session.sql_big_tables;
-SET @@session.sql_big_tables = ON;
-SELECT @@session.sql_big_tables;
-
---echo '#---------------------FN_DYNVARS_154_09----------------------#'
-###################################################################
-# Check if TRUE and FALSE values can be used on variable #
-###################################################################
-
-SET @@session.sql_big_tables = TRUE;
-SELECT @@session.sql_big_tables;
-SET @@session.sql_big_tables = FALSE;
-SELECT @@session.sql_big_tables;
-
-##############################
-# Restore initial value #
-##############################
-
-SET @@session.sql_big_tables = @session_start_value;
-SELECT @@session.sql_big_tables;
-
-###############################################################
-# END OF sql_big_tables TESTS #
-###############################################################
=== removed file 'mysql-test/suite/sys_vars/t/sql_big_tables_func.test'
--- a/mysql-test/suite/sys_vars/t/sql_big_tables_func.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/sql_big_tables_func.test 1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-############# mysql-test\t\sql_big_tables_func.test ########################
-# #
-# Variable Name: sql_big_tables #
-# Scope: SESSION #
-# Access Type: Dynamic #
-# Data Type: BOOLEAN #
-# Default Value: 0 FALSE #
-# Values: 1 TRUE, 0 FALSE #
-# #
-# #
-# Creation Date: 2008-02-25 #
-# Author: Sharique Abdullah #
-# #
-# Description: Test Cases of Dynamic System Variable "sql_big_tables" #
-# that checks behavior of this variable in the following ways #
-# * Functionality based on different values #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/set-option.html #
-# #
-############################################################################
-
-# Due to difference in the result the ps-protocol is disabled
---disable_ps_protocol
-
---echo ** Setup **
---echo
-#
-# Setup
-#
-
-SET @old_big_tables = @@SESSION.sql_big_tables;
-
-#
-# Create tables
-#
-
-CREATE TABLE t1(a varchar(20), b varchar(20));
-
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa','bb');
-
---echo '#--------------------FN_DYNVARS_155_01-------------------------#'
-#
-# TRUE mode
-#
-
-SET SESSION sql_big_tables = 1;
-
-let $diskTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1);
-let $totalTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1);
-
-eval SET @diskTableCount = $diskTablesBig;
-eval SET @tempTableCount = $totalTablesBig;
-
-SELECT * FROM (SELECT ta.a as a, tb.b as b
-FROM t1 as ta INNER JOIN t1 as tb ON ta.a = tb.a) sub;
-
-let $newDiskTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1);
-let $newTotalTablesBig = query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1);
-
-eval SET @diskTableCount = $newDiskTablesBig - @diskTableCount;
-eval SET @tempTableCount = $newTotalTablesBig - @tempTableCount;
-
-SELECT @diskTableCount;
---echo 1 Expected
-SELECT @tempTableCount;
---echo 1 Expected
-
---echo '#--------------------FN_DYNVARS_155_02-------------------------#'
-#
-# FALSE mode
-#
-
-SET SESSION sql_big_tables = 0;
-
-let $diskTables = query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1);
-let $totalTables = query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1);
-
-eval SET @diskTableCount = $diskTables;
-eval SET @tempTableCount = $totalTables;
-
-SELECT * FROM (SELECT ta.b as a, tb.a as b FROM t1 as ta INNER JOIN t1 as tb ON ta.a = tb.a) sub;
-
-let $newDiskTables= query_get_value(SHOW STATUS LIKE 'Created_tmp_disk_tables', Value, 1);
-let $newTotalTables= query_get_value(SHOW STATUS LIKE 'Created_tmp_tables', Value, 1);
-
-eval SET @diskTableCount = $newDiskTables - @diskTableCount;
-eval SET @tempTableCount = $newTotalTables - @tempTableCount;
-
-SELECT @diskTableCount;
---echo 0 Expected
-SELECT @tempTableCount;
---echo 1 Expected
-
---echo '#--------------------FN_DYNVARS_155_03-------------------------#'
-#
-# Session data integrity check
-#
---echo ** Connecting con_int1 using root **
-connect (con_int1,localhost,root,,);
---echo ** Connection con_int1 **
-connection con_int1;
-
-SELECT @@SESSION.sql_big_tables;
---echo 0 / FALSE Expected;
-SET SESSION sql_big_tables = FALSE;
-
---echo ** Connecting con_int2 using root **
-connect (con_int2,localhost,root,,);
---echo ** Connection con_int2 **
-connection con_int2;
-
-SELECT @@SESSION.sql_big_tables;
---echo 0 / FALSE Expected;
-
-SET SESSION sql_big_tables = TRUE;
-
---echo ** Connection con_int1 **
-connection con_int1;
-SELECT @@SESSION.sql_big_tables;
---echo 0 / FALSE Expected;
-
---echo ** Connection con_int2 **
-connection con_int2;
-SELECT @@SESSION.sql_big_tables;
---echo 1 / TRUE Expected;
-
---echo ** Connection default **
-connection default;
---echo Disconnecting Connections con_int1, con_int2
-disconnect con_int1;
-disconnect con_int2;
-
-#
-# Cleanup
-#
-
-SET SESSION sql_big_tables = @old_big_tables;
-
-DROP TABLE t1;
-
---enable_ps_protocol
-
=== removed file 'mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test'
--- a/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test 2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test 1970-01-01 00:00:00 +0000
@@ -1,221 +0,0 @@
-############## mysql-test\t\sql_low_priority_updates_basic.test ###############
-# #
-# Variable Name: sql_low_priority_updates #
-# Scope: GLOBAL | SESSION #
-# Access Type: Dynamic #
-# Data Type: boolean #
-# Default Value: #
-# Valid Values: 0,1 #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable sql_low_priority_updates #
-# that checks the behavior of this variable in the following ways#
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-# START OF sql_low_priority_updates TESTS #
-########################################################################
-
-
-###############################################################################
-# Saving initial value of sql_low_priority_updates in a temporary variable #
-###############################################################################
-
-SET @session_start_value = @@session.sql_low_priority_updates;
-SELECT @session_start_value;
-
-SET @global_start_value = @@global.sql_low_priority_updates;
-SELECT @global_start_value;
-
---echo '#--------------------FN_DYNVARS_159_01------------------------#'
-########################################################################
-# Display the DEFAULT value of sql_low_priority_updates #
-########################################################################
-
-SET @@session.sql_low_priority_updates = 1;
-SET @@session.sql_low_priority_updates = DEFAULT;
-SELECT @@session.sql_low_priority_updates;
-
-SET @@global.sql_low_priority_updates = 1;
-SET @@global.sql_low_priority_updates = DEFAULT;
-
---echo '#---------------------FN_DYNVARS_159_02-------------------------#'
-####################################################################################
-# Check if sql_low_priority_updates can be accessed with and without @@ sign #
-####################################################################################
-
-SET sql_low_priority_updates = 1;
-SELECT @@sql_low_priority_updates;
-
---Error ER_UNKNOWN_TABLE
-SELECT session.sql_low_priority_updates;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.sql_low_priority_updates;
-
---Error ER_UNKNOWN_TABLE
-SELECT global.sql_low_priority_updates;
-
-#using another syntax for accessing system variables
-SET session sql_low_priority_updates = 0;
-SELECT @@session.sql_low_priority_updates;
-
-SET global sql_low_priority_updates = 0;
-SELECT @@global.sql_low_priority_updates;
-
-
---echo '#--------------------FN_DYNVARS_159_03------------------------#'
-##########################################################################
-# change the value of sql_low_priority_updates to a valid value #
-##########################################################################
-# for session
-SET @@session.sql_low_priority_updates = 0;
-SELECT @@session.sql_low_priority_updates;
-SET @@session.sql_low_priority_updates = 1;
-SELECT @@session.sql_low_priority_updates;
-
-# for global
-SET @@global.sql_low_priority_updates = 0;
-SELECT @@global.sql_low_priority_updates;
-SET @@global.sql_low_priority_updates = 1;
-SELECT @@global.sql_low_priority_updates;
-
-
---echo '#--------------------FN_DYNVARS_159_04-------------------------#'
-###########################################################################
-# Change the value of sql_low_priority_updates to invalid value #
-###########################################################################
-
-# for session
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_low_priority_updates = -1;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.sql_low_priority_updates = 1.6;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_low_priority_updates = "T";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_low_priority_updates = "Y";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_low_priority_updates = TR�E;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_low_priority_updates = �N;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_low_priority_updates = OF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_low_priority_updates = �FF;
-
-# for global
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = -1;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = 2;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = "T";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = "Y";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = TR�E;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = �N;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = OF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.sql_low_priority_updates = �FF;
-
-
---echo '#-------------------FN_DYNVARS_159_05----------------------------#'
-###########################################################################
-# Test if changing global variable effects session and vice versa #
-###########################################################################
-
-SET @@global.sql_low_priority_updates = 0;
-SET @@session.sql_low_priority_updates = 1;
-SELECT @@global.sql_low_priority_updates AS res_is_0;
-
-SET @@global.sql_low_priority_updates = 0;
-SELECT @@session.sql_low_priority_updates AS res_is_1;
-
---echo '#----------------------FN_DYNVARS_159_06------------------------#'
-#########################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#########################################################################
-
-SELECT IF(@@global.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-SELECT @@global.sql_low_priority_updates;
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-
---echo '#----------------------FN_DYNVARS_159_07------------------------#'
-#########################################################################
-# Check if the value in SESSION Table matches value in variable #
-#########################################################################
-
-SELECT IF(@@session.sql_low_priority_updates, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-SELECT @@session.sql_low_priority_updates;
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='sql_low_priority_updates';
-
---echo '#---------------------FN_DYNVARS_159_08-------------------------#'
-###################################################################
-# Check if ON and OFF values can be used on variable #
-###################################################################
-
-SET @@session.sql_low_priority_updates = OFF;
-SELECT @@session.sql_low_priority_updates;
-SET @@session.sql_low_priority_updates = ON;
-SELECT @@session.sql_low_priority_updates;
-
-SET @@global.sql_low_priority_updates = OFF;
-SELECT @@global.sql_low_priority_updates;
-SET @@global.sql_low_priority_updates = ON;
-SELECT @@global.sql_low_priority_updates;
-
---echo '#---------------------FN_DYNVARS_159_09----------------------#'
-###################################################################
-# Check if TRUE and FALSE values can be used on variable #
-###################################################################
-
-SET @@session.sql_low_priority_updates = TRUE;
-SELECT @@session.sql_low_priority_updates;
-SET @@session.sql_low_priority_updates = FALSE;
-SELECT @@session.sql_low_priority_updates;
-
-SET @@global.sql_low_priority_updates = TRUE;
-SELECT @@global.sql_low_priority_updates;
-SET @@global.sql_low_priority_updates = FALSE;
-SELECT @@global.sql_low_priority_updates;
-
-##############################
-# Restore initial value #
-##############################
-
-SET @@session.sql_low_priority_updates = @session_start_value;
-SELECT @@session.sql_low_priority_updates;
-
-SET @@global.sql_low_priority_updates = @global_start_value;
-SELECT @@global.sql_low_priority_updates;
-
-###########################################################
-# END OF sql_low_priority_updates TESTS #
-###########################################################
-
=== removed file 'mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test 2010-01-29 06:33:00 +0000
+++ b/mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test 1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-
-#
-# 2010-01-20 OBN - Added check of I_S values after variable value change
-#
-
-SET @start_global_value = @@global.sql_max_join_size;
-SELECT @start_global_value;
-
-#
-# exists as global and session
-#
-select @@global.sql_max_join_size;
-select @@session.sql_max_join_size;
-show global variables like 'sql_max_join_size';
-show session variables like 'sql_max_join_size';
-select * from information_schema.global_variables where variable_name='sql_max_join_size';
-select * from information_schema.session_variables where variable_name='sql_max_join_size';
-
-#
-# show that it's writable
-#
-set global sql_max_join_size=10;
-set session sql_max_join_size=20;
-select @@global.sql_max_join_size;
-select @@session.sql_max_join_size;
-show global variables like 'sql_max_join_size';
-show session variables like 'sql_max_join_size';
-select * from information_schema.global_variables where variable_name='sql_max_join_size';
-select * from information_schema.session_variables where variable_name='sql_max_join_size';
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global sql_max_join_size=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global sql_max_join_size=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global sql_max_join_size="foo";
-
-#
-# affects OPTION_BIG_SELECTS
-#
-select @@sql_big_selects;
-set sql_max_join_size=cast(-1 as unsigned int);
-select @@sql_big_selects;
-set sql_max_join_size=100;
-select @@sql_big_selects;
-
-SET @@global.sql_max_join_size = @start_global_value;
-SELECT @@global.sql_max_join_size;
=== removed file 'mysql-test/suite/sys_vars/t/sql_max_join_size_func.test'
--- a/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test 1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-############# mysql-test\t\sql_max_join_size_func.test ####################
-# #
-# Variable Name: sql_max_join_size #
-# Scope: GLOBAL & SESSION #
-# Access Type: Dynamic #
-# Data Type: BOOLEAN #
-# Default Value: 4294967295 #
-# Values: 1-4294967295 #
-# #
-# #
-# Creation Date: 2008-02-25 #
-# Author: Sharique Abdullah #
-# #
-# Description: Test Cases of Dynamic System Variable "sql_max_join_size" #
-# that checks behavior of this variable in the following ways#
-# * Functionality based on different values #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system #
-# -variables.html#option_mysqld_max_join_size #
-# #
-###########################################################################
-
---echo ** Setup **
-#
-# Setup
-#
-
-SET @session_max_join_size = @@SESSION.sql_max_join_size;
-SET @global_max_join_size = @@GLOBAL.sql_max_join_size;
-SET @session_sql_big_selects = @@SESSION.sql_big_selects;
-
-#
-# Create tables
-#
-
-CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20));
-CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20));
-
-INSERT INTO t1 VALUES('aa','bb');
-INSERT INTO t1 VALUES('aa1','bb');
-INSERT INTO t1 VALUES('aa2','bb');
-INSERT INTO t1 VALUES('aa3','bb');
-INSERT INTO t1 VALUES('aa4','bb');
-
-INSERT INTO t2 VALUES('aa','bb');
-INSERT INTO t2 VALUES('aa1','bb');
-INSERT INTO t2 VALUES('aa2','bb');
-INSERT INTO t2 VALUES('aa3','bb');
-INSERT INTO t2 VALUES('aa4','bb');
-
---echo '#--------------------FN_DYNVARS_161_01-------------------------#'
-#
-# Testing fail condition
-#
-
-SET SESSION sql_max_join_size=9;
---error ER_TOO_BIG_SELECT
-SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
---echo Expected error The SELECT would examine more than MAX_JOIN_SIZE rows.
-
---echo '#--------------------FN_DYNVARS_161_02-------------------------#'
-#
-# Testing pass conditions
-#
-
-SET SESSION SQL_BIG_SELECTS = 1;
-
-SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
---echo This should work
-
-SET SESSION sql_max_join_size=DEFAULT;
-
-DELETE FROM t2 WHERE a = 'aa4';
-SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
---echo This should work
-
---echo '#----------------------------FN_DYNVARS_136_05-------------------------#'
-#
-# Session data integrity check & GLOBAL Value check
-#
-
-SET GLOBAL sql_max_join_size = 4;
---echo ** Connecting con_int1 using root **
-connect (con_int1,localhost,root,,);
-
---echo ** Connection con_int1 **
-connection con_int1;
-SELECT @@SESSION.sql_max_join_size;
---echo 4 Expected
-
-SET SESSION sql_max_join_size = 2;
---echo ** Connecting con_int2 using root **
-connect (con_int2,localhost,root,,);
-
---echo ** Connection con_int2 **
-connection con_int2;
-SELECT @@SESSION.sql_max_join_size;
---echo 4 Expected
-
-SET SESSION sql_max_join_size = 10;
-
---echo ** Connection con_int2 **
-connection con_int2;
-SELECT @@SESSION.sql_max_join_size;
---echo 10 Expected
-
---echo ** Connection con_int1 **
-connection con_int1;
-SELECT @@SESSION.sql_max_join_size;
---echo 2 Expected
-
-
-SELECT @@GLOBAL.sql_max_join_size;
---echo 4 Expected
-
---echo ** Connection default **
-connection default;
-
---echo Disconnecting Connections con_int1, con_int2
-disconnect con_int1;
-disconnect con_int2;
-
-
-#
-# Cleanup
-#
-
-SET @@SESSION.sql_max_join_size = @session_max_join_size;
-SET @@GLOBAL.sql_max_join_size = @global_max_join_size ;
-SET @@SESSION.sql_big_selects = @session_sql_big_selects;
-
-DROP TABLE t1;
-DROP TABLE t2;
=== modified file 'mysql-test/t/events_logs_tests-master.opt'
--- a/mysql-test/t/events_logs_tests-master.opt 2009-08-27 13:17:09 +0000
+++ b/mysql-test/t/events_logs_tests-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log-output=table,file --log-slow-queries
+--log-output=table,file --slow-query-log
=== modified file 'mysql-test/t/events_logs_tests.test'
--- a/mysql-test/t/events_logs_tests.test 2007-09-05 18:14:43 +0000
+++ b/mysql-test/t/events_logs_tests.test 2010-11-02 11:53:54 +0000
@@ -46,7 +46,7 @@ call select_general_log();
--echo Check slow query log
--echo
--echo Ensure that slow logging is on
-show variables like 'log_slow_queries';
+show variables like 'slow_query_log';
--echo
--echo Demonstrate that session value has no effect
--echo
=== modified file 'mysql-test/t/log_state-master.opt'
--- a/mysql-test/t/log_state-master.opt 2006-06-19 13:30:55 +0000
+++ b/mysql-test/t/log_state-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log-output=TABLE,FILE --log --general-log=0 --log-slow-queries --slow-query-log=0
+--log-output=TABLE,FILE --general-log=0 --slow-query-log=0
=== modified file 'mysql-test/t/log_state.test'
--- a/mysql-test/t/log_state.test 2010-05-23 20:41:18 +0000
+++ b/mysql-test/t/log_state.test 2010-11-02 11:53:54 +0000
@@ -206,42 +206,6 @@ SET GLOBAL slow_query_log = @old_slow_qu
###########################################################################
#
-# Bug#29131: SHOW VARIABLES reports variable 'log' but SET doesn't recognize it
-#
-
-SET GLOBAL general_log = ON;
-
-SHOW VARIABLES LIKE 'general_log';
-SHOW VARIABLES LIKE 'log';
-SELECT @@general_log, @@log;
-SET GLOBAL log = 0;
-SHOW VARIABLES LIKE 'general_log';
-SHOW VARIABLES LIKE 'log';
-SELECT @@general_log, @@log;
-SET GLOBAL general_log = 1;
-SHOW VARIABLES LIKE 'general_log';
-SHOW VARIABLES LIKE 'log';
-SELECT @@general_log, @@log;
-
-SHOW VARIABLES LIKE 'slow_query_log';
-SHOW VARIABLES LIKE 'log_slow_queries';
-SELECT @@slow_query_log, @@log_slow_queries;
-SET GLOBAL log_slow_queries = 0;
-SHOW VARIABLES LIKE 'slow_query_log';
-SHOW VARIABLES LIKE 'log_slow_queries';
-SELECT @@slow_query_log, @@log_slow_queries;
-SET GLOBAL slow_query_log = 1;
-SHOW VARIABLES LIKE 'slow_query_log';
-SHOW VARIABLES LIKE 'log_slow_queries';
-SELECT @@slow_query_log, @@log_slow_queries;
-
-SET GLOBAL general_log = @old_general_log;
-SET GLOBAL slow_query_log = @old_slow_query_log;
-
-
-###########################################################################
-
-#
# Bug#31604: server crash when setting slow_query_log_file/general_log_file
#
@@ -281,38 +245,6 @@ SET GLOBAL slow_query_log_file = @old_sl
--echo
--echo # -- End of Bug#32748.
-
-###########################################################################
-
-# WL#4403 - deprecate @log and @slow_log_queries variables
-
-# These server system variables are all deprecated
-# -- show for command-line as well!
---echo deprecated:
-SET GLOBAL log = 0;
-SET GLOBAL log_slow_queries = 0;
-SET GLOBAL log = DEFAULT;
-SET GLOBAL log_slow_queries = DEFAULT;
-
-# These server system variables are NOT deprecated.
---echo not deprecated:
-SELECT @@global.general_log_file INTO @my_glf;
-SELECT @@global.slow_query_log_file INTO @my_sqlf;
-SET GLOBAL general_log = 0;
-SET GLOBAL slow_query_log = 0;
-SET GLOBAL general_log_file = 'WL4403_G.log';
-SET GLOBAL slow_query_log_file = 'WL4403_SQ.log';
-SET GLOBAL general_log_file = @my_glf;
-SET GLOBAL slow_query_log_file = @my_sqlf;
-SET GLOBAL general_log = DEFAULT;
-SET GLOBAL slow_query_log = DEFAULT;
-
-## Reset to initial values
-SET @@global.general_log = @old_general_log;
-SET @@global.general_log_file = @old_general_log_file;
-SET @@global.slow_query_log = @old_slow_query_log;
-SET @@global.slow_query_log_file = @old_slow_query_log_file;
-
###########################################################################
--echo #
=== modified file 'mysql-test/t/log_state_bug33693-master.opt'
--- a/mysql-test/t/log_state_bug33693-master.opt 2009-10-12 13:35:30 +0000
+++ b/mysql-test/t/log_state_bug33693-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---pid-file=$MYSQLTEST_VARDIR/run/mysqld.1.pid --log=
+--pid-file=$MYSQLTEST_VARDIR/run/mysqld.1.pid --general-log
=== modified file 'mysql-test/t/log_tables-big-master.opt'
--- a/mysql-test/t/log_tables-big-master.opt 2007-04-04 19:40:47 +0000
+++ b/mysql-test/t/log_tables-big-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log-slow-queries
+--slow-query-log
=== modified file 'mysql-test/t/log_tables-master.opt'
--- a/mysql-test/t/log_tables-master.opt 2009-08-27 13:17:09 +0000
+++ b/mysql-test/t/log_tables-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log-output=table,file --log-slow-queries
+--log-output=table,file --slow-query-log
=== modified file 'mysql-test/t/multi_statement-master.opt'
--- a/mysql-test/t/multi_statement-master.opt 2005-02-17 19:48:44 +0000
+++ b/mysql-test/t/multi_statement-master.opt 2010-11-02 11:53:54 +0000
@@ -1,2 +1,3 @@
---log-slow-queries=slow.log
+--slow-query-log
+--slow-query-log-file=slow-log
--log-queries-not-using-indexes
=== modified file 'mysql-test/t/mysql_client_test-master.opt'
--- a/mysql-test/t/mysql_client_test-master.opt 2008-02-25 10:48:02 +0000
+++ b/mysql-test/t/mysql_client_test-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE
+--general-log=1 --general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE
=== modified file 'mysql-test/t/no-threads-master.opt'
--- a/mysql-test/t/no-threads-master.opt 2007-02-23 11:13:55 +0000
+++ b/mysql-test/t/no-threads-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---one-thread --thread-handling=no-threads
+--thread-handling=no-threads
=== removed file 'mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt'
--- a/mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt 2010-01-06 10:54:45 +0000
+++ b/mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---optimizer-switch=engine_condition_pushdown=off --engine-condition-pushdown=1
=== removed file 'mysql-test/t/optimizer_switch_eng_cond_pushdown1.test'
--- a/mysql-test/t/optimizer_switch_eng_cond_pushdown1.test 2010-06-18 08:45:53 +0000
+++ b/mysql-test/t/optimizer_switch_eng_cond_pushdown1.test 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-# check how --engine-condition-pushdown and --optimizer-switch
-# influence each other when used together (last wins).
---source include/have_engine_condition_pushdown.inc
-
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
=== removed file 'mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt'
--- a/mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt 2010-01-06 10:54:45 +0000
+++ b/mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---engine-condition-pushdown=1 --optimizer-switch=engine_condition_pushdown=off
=== removed file 'mysql-test/t/optimizer_switch_eng_cond_pushdown2.test'
--- a/mysql-test/t/optimizer_switch_eng_cond_pushdown2.test 2010-06-18 08:45:53 +0000
+++ b/mysql-test/t/optimizer_switch_eng_cond_pushdown2.test 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-# check how --engine-condition-pushdown and --optimizer-switch
-# influence each other when used together (last wins).
---source include/have_engine_condition_pushdown.inc
-
-select @@session.engine_condition_pushdown,
-@@global.engine_condition_pushdown,
-@@session.optimizer_switch, @@global.optimizer_switch;
=== modified file 'mysql-test/t/ps-master.opt'
--- a/mysql-test/t/ps-master.opt 2010-02-17 09:18:17 +0000
+++ b/mysql-test/t/ps-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log-output=table,file --log-slow-queries --log-queries-not-using-indexes
+--log-output=table,file --slow-query-log --log-queries-not-using-indexes
=== modified file 'mysql-test/t/show_check-master.opt'
--- a/mysql-test/t/show_check-master.opt 2010-02-17 09:18:17 +0000
+++ b/mysql-test/t/show_check-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log-output=table,file --log-slow-queries --log-queries-not-using-indexes --myisam-recover=""
+--log-output=table,file --slow-query-log --log-queries-not-using-indexes --myisam-recover=""
=== modified file 'mysql-test/t/union-master.opt'
--- a/mysql-test/t/union-master.opt 2010-02-17 09:18:17 +0000
+++ b/mysql-test/t/union-master.opt 2010-11-02 11:53:54 +0000
@@ -1 +1 @@
---log-slow-queries --log-queries-not-using-indexes
+--slow-query-log --log-queries-not-using-indexes
=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test 2010-10-05 09:15:51 +0000
+++ b/mysql-test/t/variables.test 2010-11-02 11:53:54 +0000
@@ -340,11 +340,9 @@ select @@sql_auto_is_null;
set @@sql_auto_is_null=0;
select @@sql_auto_is_null;
set sql_big_selects=1;
-set sql_big_tables=1;
set sql_buffer_result=1;
set sql_log_bin=1;
set sql_log_off=1;
-set sql_low_priority_updates=1;
set sql_quote_show_create=1;
set sql_safe_updates=1;
set sql_select_limit=1;
@@ -520,14 +518,6 @@ set character_set_results=NULL;
select ifnull(@@character_set_results,"really null");
set names latin1;
-
-#
-# Bug #9613: @@have_innodb
-#
-
---replace_column 1 #
-select @@have_innodb;
-
#
# Tests for lc_time_names
# Note, when adding new locales, please fix ID accordingly:
=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql 2010-10-27 10:28:09 +0000
+++ b/scripts/mysql_system_tables.sql 2010-11-02 11:53:54 +0000
@@ -80,8 +80,8 @@ CREATE TABLE IF NOT EXISTS proc (db char
CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) COLLATE utf8_general_ci DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges';
-- Create general_log if CSV is enabled.
-
-SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, thread_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0');
+SET @have_csv = (SELECT support FROM information_schema.engines WHERE engine = 'CSV');
+SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, thread_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
@@ -89,7 +89,7 @@ DROP PREPARE stmt;
-- Create slow_log if CSV is enabled.
-SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0');
+SET @str = IF (@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER UNSIGNED NOT NULL, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2010-10-28 19:25:16 +0000
+++ b/sql/mysqld.cc 2010-11-02 11:53:54 +0000
@@ -4044,13 +4044,6 @@ a file name for --log-bin-index option",
}
plugins_are_initialized= TRUE; /* Don't separate from init function */
- have_csv= plugin_status(STRING_WITH_LEN("csv"),
- MYSQL_STORAGE_ENGINE_PLUGIN);
- have_ndbcluster= plugin_status(STRING_WITH_LEN("ndbcluster"),
- MYSQL_STORAGE_ENGINE_PLUGIN);
- have_partitioning= plugin_status(STRING_WITH_LEN("partition"),
- MYSQL_STORAGE_ENGINE_PLUGIN);
-
/* we do want to exit if there are any other unknown options */
if (remaining_argc > 1)
{
@@ -5935,9 +5928,6 @@ struct my_option my_long_options[]=
"Set the language used for the month names and the days of the week.",
&lc_time_names_name, &lc_time_names_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
- {"log", 'l', "Log connections and queries to file (deprecated option, use "
- "--general-log/--general-log-file instead).", &opt_logname, &opt_logname,
- 0, GET_STR_ALLOC, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"log-bin", OPT_BIN_LOG,
"Log update queries in binary format. Optional (but strongly recommended "
"to avoid replication problems if server's hostname changes) argument "
@@ -5963,13 +5953,6 @@ struct my_option my_long_options[]=
"Log slow statements executed by slave thread to the slow log if it is open.",
&opt_log_slow_slave_statements, &opt_log_slow_slave_statements,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
- {"log-slow-queries", OPT_SLOW_QUERY_LOG,
- "Log slow queries to a table or log file. Defaults logging to table "
- "mysql.slow_log or hostname-slow.log if --log-output=file is used. "
- "Must be enabled to activate other slow log options. "
- "Deprecated option, use --slow-query-log/--slow-query-log-file instead.",
- &opt_slow_logname, &opt_slow_logname, 0, GET_STR_ALLOC, OPT_ARG,
- 0, 0, 0, 0, 0, 0},
{"log-tc", 0,
"Path to transaction coordinator log (used for transactions that affect "
"more than one storage engine, when binary log is disabled).",
@@ -5999,10 +5982,6 @@ struct my_option my_long_options[]=
#endif /* HAVE_REPLICATION */
{"memlock", 0, "Lock mysqld in memory.", &locked_in_memory,
&locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
- {"one-thread", OPT_ONE_THREAD,
- "(Deprecated): Only use one thread (for debugging under Linux). Use "
- "thread-handling=no-threads instead.",
- 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"old-style-user-limits", 0,
"Enable old-style user limits (before 5.0.3, user resources were counted "
"per each user+host vs. per account).",
@@ -6092,10 +6071,6 @@ struct my_option my_long_options[]=
{"skip-stack-trace", OPT_SKIP_STACK_TRACE,
"Don't print a stack trace on failure.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0,
0, 0, 0, 0},
- {"skip-thread-priority", OPT_SKIP_PRIOR,
- "Don't give threads different priorities. This option is deprecated "
- "because it has no effect; the implied behavior is already the default.",
- 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_REPLICATION
{"sporadic-binlog-dump-fail", 0,
"Option used by mysql-test for debugging and testing of replication.",
@@ -7026,10 +7001,6 @@ mysqld_get_one_option(int optid,
if (default_collation_name == compiled_default_collation_name)
default_collation_name= 0;
break;
- case 'l':
- WARN_DEPRECATED(NULL, "--log", "'--general-log'/'--general-log-file'");
- opt_log=1;
- break;
case 'h':
strmake(mysql_real_data_home,argument, sizeof(mysql_real_data_home)-1);
/* Correct pointer set by my_getopt (for embedded library) */
@@ -7164,10 +7135,6 @@ mysqld_get_one_option(int optid,
break;
}
#endif /* HAVE_REPLICATION */
- case (int) OPT_SLOW_QUERY_LOG:
- WARN_DEPRECATED(NULL, "--log-slow-queries", "'--slow-query-log'/'--slow-query-log-file'");
- opt_slow_log= 1;
- break;
case (int) OPT_MASTER_RETRY_COUNT:
WARN_DEPRECATED(NULL, "--master-retry-count", "'CHANGE MASTER TO master_retry_count = <num>'");
break;
@@ -7189,12 +7156,6 @@ mysqld_get_one_option(int optid,
myisam_recover_options= HA_RECOVER_DEFAULT;
ha_open_options&= ~(HA_OPEN_DELAY_KEY_WRITE);
break;
- case (int) OPT_SKIP_PRIOR:
- opt_specialflag|= SPECIAL_NO_PRIOR;
- sql_print_warning("The --skip-thread-priority startup option is deprecated "
- "and will be removed in MySQL 7.0. This option has no effect "
- "as the implied behavior is already the default.");
- break;
case (int) OPT_SKIP_HOST_CACHE:
opt_specialflag|= SPECIAL_NO_HOST_CACHE;
break;
@@ -7240,9 +7201,6 @@ mysqld_get_one_option(int optid,
case OPT_SERVER_ID:
server_id_supplied = 1;
break;
- case OPT_ONE_THREAD:
- thread_handling= SCHEDULER_ONE_THREAD_PER_CONNECTION;
- break;
case OPT_LOWER_CASE_TABLE_NAMES:
lower_case_table_names_used= 1;
break;
=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h 2010-10-28 19:25:16 +0000
+++ b/sql/mysqld.h 2010-11-02 11:53:54 +0000
@@ -371,7 +371,6 @@ enum options_mysqld
OPT_LC_MESSAGES_DIRECTORY,
OPT_LOWER_CASE_TABLE_NAMES,
OPT_MASTER_RETRY_COUNT,
- OPT_ONE_THREAD,
OPT_POOL_OF_THREADS,
OPT_REPLICATE_DO_DB,
OPT_REPLICATE_DO_TABLE,
@@ -385,11 +384,9 @@ enum options_mysqld
OPT_SKIP_HOST_CACHE,
OPT_SKIP_LOCK,
OPT_SKIP_NEW,
- OPT_SKIP_PRIOR,
OPT_SKIP_RESOLVE,
OPT_SKIP_STACK_TRACE,
OPT_SKIP_SYMLINKS,
- OPT_SLOW_QUERY_LOG,
OPT_SSL_CA,
OPT_SSL_CAPATH,
OPT_SSL_CERT,
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc 2010-10-26 09:10:59 +0000
+++ b/sql/sql_plugin.cc 2010-11-02 11:53:54 +0000
@@ -1100,11 +1100,6 @@ err:
mysql_mutex_lock(&LOCK_plugin);
plugin->state= state;
- /* maintain the obsolete @@have_innodb variable */
- if (!my_strcasecmp(&my_charset_latin1, plugin->name.str, "InnoDB"))
- have_innodb= state & PLUGIN_IS_READY ? SHOW_OPTION_YES
- : SHOW_OPTION_DISABLED;
-
DBUG_RETURN(ret);
}
=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy 2010-10-21 12:18:25 +0000
+++ b/sql/sql_yacc.yy 2010-11-02 11:53:54 +0000
@@ -780,10 +780,10 @@ bool my_yyoverflow(short **a, YYSTYPE **
%pure_parser /* We have threads */
/*
- Currently there are 168 shift/reduce conflicts.
+ Currently there are 167 shift/reduce conflicts.
We should not introduce new conflicts any more.
*/
-%expect 168
+%expect 167
/*
Comments for TOKENS.
@@ -6903,10 +6903,6 @@ opt_to:
| AS {}
;
-/*
- SLAVE START and SLAVE STOP are deprecated. We keep them for compatibility.
-*/
-
slave:
START_SYM SLAVE slave_thread_opts
{
@@ -6926,24 +6922,6 @@ slave:
lex->type = 0;
/* If you change this code don't forget to update SLAVE STOP too */
}
- | SLAVE START_SYM slave_thread_opts
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_SLAVE_START;
- lex->type = 0;
- /* We'll use mi structure for UNTIL options */
- lex->mi.set_unspecified();
- /* If you change this code don't forget to update START SLAVE too */
- }
- slave_until
- {}
- | SLAVE STOP_SYM slave_thread_opts
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_SLAVE_STOP;
- lex->type = 0;
- /* If you change this code don't forget to update STOP SLAVE too */
- }
;
start:
@@ -12750,7 +12728,6 @@ keyword_sp:
| NVARCHAR_SYM {}
| OFFSET_SYM {}
| OLD_PASSWORD {}
- | ONE_SHOT_SYM {}
| ONE_SYM {}
| PACK_KEYS_SYM {}
| PAGE_SYM {}
@@ -12985,7 +12962,6 @@ option_type:
option_type2:
/* empty */ { $$= OPT_DEFAULT; }
- | ONE_SHOT_SYM { Lex->one_shot_set= 1; $$= OPT_SESSION; }
;
opt_var_type:
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc 2010-10-28 19:25:16 +0000
+++ b/sql/sys_vars.cc 2010-11-02 11:53:54 +0000
@@ -1059,14 +1059,6 @@ static Sys_var_mybool Sys_low_priority_u
DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_low_prio_updates));
-static Sys_var_mybool Sys_sql_low_priority_updates(
- "sql_low_priority_updates",
- "INSERT/DELETE/UPDATE has lower priority than selects",
- SESSION_VAR(low_priority_updates), NO_CMD_LINE,
- DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_low_prio_updates),
- DEPRECATED("@@low_priority_updates"));
-
static Sys_var_mybool Sys_lower_case_file_system(
"lower_case_file_system",
"Case sensitivity of file names on the file system where the "
@@ -1237,13 +1229,6 @@ static Sys_var_ulong Sys_max_length_for_
SESSION_VAR(max_length_for_sort_data), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(4, 8192*1024L), DEFAULT(1024), BLOCK_SIZE(1));
-static Sys_var_harows Sys_sql_max_join_size(
- "sql_max_join_size", "Alias for max_join_size",
- SESSION_VAR(max_join_size), NO_CMD_LINE,
- VALID_RANGE(1, HA_POS_ERROR), DEFAULT(HA_POS_ERROR), BLOCK_SIZE(1),
- NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_max_join_size), DEPRECATED("@@max_join_size"));
-
static PolyLock_mutex PLock_prepared_stmt_count(&LOCK_prepared_stmt_count);
static Sys_var_ulong Sys_max_prepared_stmt_count(
"max_prepared_stmt_count",
@@ -2184,27 +2169,6 @@ static Sys_var_ulong Sys_net_wait_timeou
VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-/** propagates changes to the relevant flag of @@optimizer_switch */
-static bool fix_engine_condition_pushdown(sys_var *self, THD *thd,
- enum_var_type type)
-{
- SV *sv= (type == OPT_GLOBAL) ? &global_system_variables : &thd->variables;
- if (sv->engine_condition_pushdown)
- sv->optimizer_switch|= OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN;
- else
- sv->optimizer_switch&= ~OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN;
- return false;
-}
-static Sys_var_mybool Sys_engine_condition_pushdown(
- "engine_condition_pushdown",
- "Push supported query conditions to the storage engine."
- " Deprecated, use --optimizer-switch instead.",
- SESSION_VAR(engine_condition_pushdown),
- CMD_LINE(OPT_ARG, OPT_ENGINE_CONDITION_PUSHDOWN),
- DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL),
- ON_UPDATE(fix_engine_condition_pushdown),
- DEPRECATED("'@@optimizer_switch'"));
-
static Sys_var_plugin Sys_default_storage_engine(
"default_storage_engine", "The default storage engine for new tables",
SESSION_VAR(table_plugin), NO_CMD_LINE,
@@ -2325,12 +2289,6 @@ static Sys_var_mybool Sys_big_tables(
"temporary sets on file (Solves most 'table full' errors)",
SESSION_VAR(big_tables), CMD_LINE(OPT_ARG), DEFAULT(FALSE));
-static Sys_var_mybool Sys_sql_big_tables(
- "sql_big_tables", "alias for big_tables",
- SESSION_VAR(big_tables), NO_CMD_LINE, DEFAULT(FALSE),
- NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
- DEPRECATED("@@big_tables"));
-
static Sys_var_bit Sys_big_selects(
"sql_big_selects", "sql_big_selects",
SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_BIG_SELECTS,
@@ -2806,25 +2764,6 @@ static Sys_var_charptr Sys_slow_log_path
IN_FS_CHARSET, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
ON_CHECK(check_log_path), ON_UPDATE(fix_slow_log_file));
-/// @todo deprecate these four legacy have_PLUGIN variables and use I_S instead
-export SHOW_COMP_OPTION have_csv, have_innodb;
-export SHOW_COMP_OPTION have_ndbcluster, have_partitioning;
-static Sys_var_have Sys_have_csv(
- "have_csv", "have_csv",
- READ_ONLY GLOBAL_VAR(have_csv), NO_CMD_LINE);
-
-static Sys_var_have Sys_have_innodb(
- "have_innodb", "have_innodb",
- READ_ONLY GLOBAL_VAR(have_innodb), NO_CMD_LINE);
-
-static Sys_var_have Sys_have_ndbcluster(
- "have_ndbcluster", "have_ndbcluster",
- READ_ONLY GLOBAL_VAR(have_ndbcluster), NO_CMD_LINE);
-
-static Sys_var_have Sys_have_partition_db(
- "have_partitioning", "have_partitioning",
- READ_ONLY GLOBAL_VAR(have_partitioning), NO_CMD_LINE);
-
static Sys_var_have Sys_have_compress(
"have_compress", "have_compress",
READ_ONLY GLOBAL_VAR(have_compress), NO_CMD_LINE);
@@ -2874,13 +2813,6 @@ static Sys_var_mybool Sys_general_log(
DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_log_state));
-// Synonym of "general_log" for consistency with SHOW VARIABLES output
-static Sys_var_mybool Sys_log(
- "log", "Alias for --general-log. Deprecated",
- GLOBAL_VAR(opt_log), NO_CMD_LINE,
- DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_log_state), DEPRECATED("'@@general_log'"));
-
static Sys_var_mybool Sys_slow_query_log(
"slow_query_log",
"Log slow queries to a table or log file. Defaults logging to a file "
@@ -2890,13 +2822,6 @@ static Sys_var_mybool Sys_slow_query_log
DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_log_state));
-/* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */
-static Sys_var_mybool Sys_log_slow(
- "log_slow_queries",
- "Alias for --slow-query-log. Deprecated",
- GLOBAL_VAR(opt_slow_log), NO_CMD_LINE,
- DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_log_state), DEPRECATED("'@@slow_query_log'"));
static bool fix_log_state(sys_var *self, THD *thd, enum_var_type type)
{
@@ -2904,13 +2829,13 @@ static bool fix_log_state(sys_var *self,
my_bool *UNINIT_VAR(newvalptr), newval, UNINIT_VAR(oldval);
uint UNINIT_VAR(log_type);
- if (self == &Sys_general_log || self == &Sys_log)
+ if (self == &Sys_general_log)
{
newvalptr= &opt_log;
oldval= logger.get_log_file_handler()->is_open();
log_type= QUERY_LOG_GENERAL;
}
- else if (self == &Sys_slow_query_log || self == &Sys_log_slow)
+ else if (self == &Sys_slow_query_log)
{
newvalptr= &opt_slow_log;
oldval= logger.get_slow_log_file_handler()->is_open();
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c 2010-10-21 09:49:16 +0000
+++ b/tests/mysql_client_test.c 2010-11-02 11:53:54 +0000
@@ -263,7 +263,9 @@ static my_bool check_have_innodb(MYSQL *
int rc;
my_bool result;
- rc= mysql_query(conn, "show variables like 'have_innodb'");
+ rc= mysql_query(conn,
+ "SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') "
+ "AS `TRUE` FROM information_schema.engines WHERE engine = 'innodb'");
myquery(rc);
res= mysql_use_result(conn);
DIE_UNLESS(res);
@@ -271,7 +273,7 @@ static my_bool check_have_innodb(MYSQL *
row= mysql_fetch_row(res);
DIE_UNLESS(row);
- result= strcmp(row[1], "YES") == 0;
+ result= strcmp(row[1], "1") == 0;
mysql_free_result(res);
return result;
}
Attachment: [text/bzr-bundle] bzr/magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk.bundle
