List:Commits« Previous MessageNext Message »
From:Magne Mahre Date:October 25 2010 9:20am
Subject:bzr commit into mysql-next-mr-bugfixing branch (magne.mahre:3332) WL#5265
View as plain text  
#At file:///export/home/tmp/x/mysql-next-mr-bugfixing-wl5265/ based on revid:tor.didriksen@stripped24-xgdiku0v2ayencmh

 3332 Magne Mahre	2010-10-25
      WL#5265 Deprecate features in Dahlia
      
      This is a patch for deprecating items, so they can
      be scheduled for removal at a later stage.
      
      A deprecation consists of adding a deprecation note
      to help texts, and returning a SQL warning upon
      the use.
      
      Most of the affected regression tests have been
      changed to use new or alternative syntax.  A few tests,
      in particular in the 'sys_vars' suite are still run
      with the deprecated syntax, to verify that the options 
      still work, and give the correct warning text.
      
      Some deprecation warnings introduced by an earlier patch
      included the MySQL version number when the feature/option
      would be removed.  Since future version numbers may not
      be known, the text has been changed to "and will be removed 
      in a future release".
      
      The following items have been adressed by this patch:
      -----------------------------------------------------
      --master-retry-count       option deprecated (see also Bug#44209)
      --languages | -l           option deprecated (see also WL#751)
      @@storage_engine           sysvar deprecated (see also WL#4738)
      @@sql_big_tables           sysvar deprecated
      @@sql_low_priority_updates sysvar deprecated
      @@thread_concurrency       sysvar deprecated (see also Bug#55001)
      
      In addition, the following is mentioned in the worklog,
      but already adressed by other patches:
      --------------------------------------------------------
      @@table_lock_wait_timeout  sysvar was removed as part of Bug#45225
      
      @@optimizer_search_depth ( value 63) was deprecated in WL#5252 
                                    and removed as part of WL#5369
     @ mysql-test/r/variables.result
        Using "old" options here to verify the warning.
     @ sql/set_var.cc
        Deprecation warnings should not say in which
        version a feature will be removed (as this is
        normally not known at the time.  (as per DBPAC
        decision).  Removing asserts that depend on
        future version information.
     @ sql/sql_priv.h
        Removing compile time asserts based on future
        version numbers.
     @ sql/sys_vars.cc
        Added deprecation text and macro.  Deprecation
        macro has been changed to no longer include
        version numbers.
     @ sql/sys_vars.h
        Deprecation macro is changed to no longer
        include version number information.
        
        sysvar constructors no longer get deprecation version
        information.

    modified:
      mysql-test/include/commit.inc
      mysql-test/include/common-tests.inc
      mysql-test/include/concurrent.inc
      mysql-test/include/deadlock.inc
      mysql-test/include/handler.inc
      mysql-test/include/index_merge1.inc
      mysql-test/include/index_merge2.inc
      mysql-test/include/index_merge_2sweeps.inc
      mysql-test/include/index_merge_ror.inc
      mysql-test/include/index_merge_ror_cpk.inc
      mysql-test/include/loaddata_autocom.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mix2.inc
      mysql-test/include/query_cache.inc
      mysql-test/include/read_many_rows.inc
      mysql-test/include/rowid_order.inc
      mysql-test/include/select.inc
      mysql-test/include/unsafe_binlog.inc
      mysql-test/r/archive.result
      mysql-test/r/archive_gis.result
      mysql-test/r/cache_innodb.result
      mysql-test/r/commit_1innodb.result
      mysql-test/r/compress.result
      mysql-test/r/concurrent_innodb_safelog.result
      mysql-test/r/concurrent_innodb_unsafelog.result
      mysql-test/r/create.result
      mysql-test/r/deadlock_innodb.result
      mysql-test/r/group_by.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/heap.result
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/loaddata_autocom_innodb.result
      mysql-test/r/log_state.result
      mysql-test/r/log_tables.result
      mysql-test/r/merge.result
      mysql-test/r/merge_mmap.result
      mysql-test/r/mix2_myisam.result
      mysql-test/r/myisam.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqldump-max.result
      mysql-test/r/partition.result
      mysql-test/r/rowid_order_innodb.result
      mysql-test/r/select_none.result
      mysql-test/r/ssl.result
      mysql-test/r/ssl_compress.result
      mysql-test/r/type_blob.result
      mysql-test/r/unsafe_binlog_innodb.result
      mysql-test/r/variables.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_bug34053.result
      mysql-test/suite/innodb/r/innodb_bug35220.result
      mysql-test/suite/innodb/r/innodb_bug36172.result
      mysql-test/suite/innodb/r/innodb_bug38231.result
      mysql-test/suite/innodb/r/innodb_bug39438.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/r/innodb_trx_weight.result
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_bug34053.test
      mysql-test/suite/innodb/t/innodb_bug35220.test
      mysql-test/suite/innodb/t/innodb_bug36172.test
      mysql-test/suite/innodb/t/innodb_bug38231.test
      mysql-test/suite/innodb/t/innodb_bug39438.test
      mysql-test/suite/innodb/t/innodb_gis.test
      mysql-test/suite/innodb/t/innodb_trx_weight.test
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_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_selects_func.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/r/storage_engine_basic.result
      mysql-test/suite/sys_vars/t/storage_engine_basic.test
      mysql-test/t/archive.test
      mysql-test/t/archive_gis.test
      mysql-test/t/create.test
      mysql-test/t/group_by.test
      mysql-test/t/heap.test
      mysql-test/t/innodb_icp_none.test
      mysql-test/t/innodb_mrr_none.test
      mysql-test/t/log_tables.test
      mysql-test/t/merge.test
      mysql-test/t/merge_mmap.test
      mysql-test/t/mysqldump-max.test
      mysql-test/t/partition.test
      mysql-test/t/type_blob.test
      sql/mysqld.cc
      sql/mysqld.h
      sql/set_var.cc
      sql/set_var.h
      sql/sql_plugin.cc
      sql/sql_priv.h
      sql/sys_vars.cc
      sql/sys_vars.h
=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2010-08-18 09:35:41 +0000
+++ b/mysql-test/include/commit.inc	2010-10-25 09:20:53 +0000
@@ -7,7 +7,7 @@
 ##
 
 set sql_mode=no_engine_substitution;
-eval set storage_engine = $engine_type;
+eval set default_storage_engine = $engine_type;
 set autocommit=1;
 
 --disable_warnings

=== modified file 'mysql-test/include/common-tests.inc'
--- a/mysql-test/include/common-tests.inc	2010-06-18 08:45:53 +0000
+++ b/mysql-test/include/common-tests.inc	2010-10-25 09:20:53 +0000
@@ -1413,9 +1413,9 @@ drop table tmp;
 
 # big table done
 
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
 select distinct fld5 from t2 limit 10;
 
@@ -1424,9 +1424,9 @@ select distinct fld5 from t2 limit 10;
 #
 
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
-SET SQL_BIG_TABLES=1; # Force use of MyISAM
+SET BIG_TABLES=1; # Force use of MyISAM
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
 
 #

=== modified file 'mysql-test/include/concurrent.inc'
--- a/mysql-test/include/concurrent.inc	2009-06-04 18:36:34 +0000
+++ b/mysql-test/include/concurrent.inc	2010-10-25 09:20:53 +0000
@@ -67,7 +67,7 @@ drop table if exists t1;
   connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1(eta int(11) not null, tipo int(11), c varchar(255));
   insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -165,7 +165,7 @@ drop table t1;
   #connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1(eta int(11) not null, tipo int(11), c varchar(255));
   insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -262,7 +262,7 @@ drop table t1;
   #connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1 (a int not null, b int not null);
   insert into t1 values (1,1),(2,1),(3,1),(4,1);
   --echo ** Create ULL 'hello2'
@@ -317,7 +317,7 @@ drop table t1;
   #connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1(eta int(11) not null, tipo int(11), c varchar(255));
   insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -387,7 +387,7 @@ drop table t1;
   #connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1(eta int(11) not null, tipo int(11), c varchar(255));
   insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -466,7 +466,7 @@ drop table t1;
   #connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1(eta int(11) not null, tipo int(11), c varchar(255));
   insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -532,7 +532,7 @@ drop table t1;
   #connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1(eta int(11) not null, tipo int(11), c varchar(255));
   insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -595,7 +595,7 @@ drop table t1;
   #connect (thread1, localhost, mysqltest,,);
   connection thread1;
   --echo ** Set up table
-  eval SET SESSION STORAGE_ENGINE = $engine_type;
+  eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
   create table t1(eta int(11) not null, tipo int(11), c varchar(255));
   insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");

=== modified file 'mysql-test/include/deadlock.inc'
--- a/mysql-test/include/deadlock.inc	2010-08-18 09:35:41 +0000
+++ b/mysql-test/include/deadlock.inc	2010-10-25 09:20:53 +0000
@@ -150,7 +150,7 @@ drop table t1, t2;
 # Bug#25164 create table `a` as select * from `A` hangs
 #
 
-set storage_engine=innodb;
+set default_storage_engine=innodb;
 
 --disable_warnings
 drop table if exists a;
@@ -167,6 +167,6 @@ drop table A;
 drop table if exists a;
 --enable_warnings
 
-set storage_engine=default;
+set default_storage_engine=default;
 
 --echo End of 5.0 tests.

=== modified file 'mysql-test/include/handler.inc'
--- a/mysql-test/include/handler.inc	2010-08-12 13:50:23 +0000
+++ b/mysql-test/include/handler.inc	2010-10-25 09:20:53 +0000
@@ -19,7 +19,7 @@
 #               main testing code put into include/handler.inc
 #
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t1,t3,t4,t5;

=== modified file 'mysql-test/include/index_merge1.inc'
--- a/mysql-test/include/index_merge1.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/include/index_merge1.inc	2010-10-25 09:20:53 +0000
@@ -19,7 +19,7 @@
 
 --echo #---------------- Index merge test 1 -------------------------------------------
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t0, t1, t2, t3, t4;

=== modified file 'mysql-test/include/index_merge2.inc'
--- a/mysql-test/include/index_merge2.inc	2009-08-25 15:53:43 +0000
+++ b/mysql-test/include/index_merge2.inc	2010-10-25 09:20:53 +0000
@@ -17,7 +17,7 @@
 
 --echo #---------------- Index merge test 2 -------------------------------------------
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t1,t2;

=== modified file 'mysql-test/include/index_merge_2sweeps.inc'
--- a/mysql-test/include/index_merge_2sweeps.inc	2006-08-16 12:58:49 +0000
+++ b/mysql-test/include/index_merge_2sweeps.inc	2010-10-25 09:20:53 +0000
@@ -14,7 +14,7 @@
 
 --echo #---------------- 2-sweeps read Index merge test 2 -------------------------------
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t1;

=== modified file 'mysql-test/include/index_merge_ror.inc'
--- a/mysql-test/include/index_merge_ror.inc	2006-12-26 14:04:31 +0000
+++ b/mysql-test/include/index_merge_ror.inc	2010-10-25 09:20:53 +0000
@@ -17,7 +17,7 @@
 
 --echo #---------------- ROR-index_merge tests -----------------------
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists  t0,t1,t2;

=== modified file 'mysql-test/include/index_merge_ror_cpk.inc'
--- a/mysql-test/include/index_merge_ror_cpk.inc	2010-09-27 13:20:24 +0000
+++ b/mysql-test/include/index_merge_ror_cpk.inc	2010-10-25 09:20:53 +0000
@@ -17,7 +17,7 @@
 
 --echo #---------------- Clustered PK ROR-index_merge tests -----------------------------
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists  t1;

=== modified file 'mysql-test/include/loaddata_autocom.inc'
--- a/mysql-test/include/loaddata_autocom.inc	2007-12-12 17:19:24 +0000
+++ b/mysql-test/include/loaddata_autocom.inc	2010-10-25 09:20:53 +0000
@@ -1,7 +1,7 @@
 # Test if the engine does autocommit in LOAD DATA INFILE, or not
 # (NDB wants to do, others don't).
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t1;

=== modified file 'mysql-test/include/mix1.inc'
--- a/mysql-test/include/mix1.inc	2010-08-20 09:15:16 +0000
+++ b/mysql-test/include/mix1.inc	2010-10-25 09:20:53 +0000
@@ -25,7 +25,7 @@
 #                 where just some indexes have been created must be used.
 #
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;

=== modified file 'mysql-test/include/mix2.inc'
--- a/mysql-test/include/mix2.inc	2010-08-16 07:30:40 +0000
+++ b/mysql-test/include/mix2.inc	2010-10-25 09:20:53 +0000
@@ -55,7 +55,7 @@
 # Set the SESSION DEFAULT STORAGE ENGINE to a value <> storage engine
 # to be tested. This must not affect any CREATE TABLE statement, where
 # the storage engine is assigned explicitely,
-eval SET SESSION STORAGE_ENGINE = $other_engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $other_engine_type;
 
 #
 # Small basic test with ignore
@@ -1457,8 +1457,8 @@ show variables like "innodb_thread_sleep
 # Test varchar
 #
 
-let $default=`select @@storage_engine`;
-eval set storage_engine=$engine_type;
+let $default=`select @@default_storage_engine`;
+eval set default_storage_engine=$engine_type;
 source include/varchar.inc;
 
 #
@@ -1477,7 +1477,7 @@ create table t1 (v varchar(65530) charac
 show create table t1;
 drop table t1;
 
-eval set storage_engine=$default;
+eval set default_storage_engine=$default;
 
 # InnoDB specific varchar tests
 eval create table t1 (v varchar(16384)) engine=$engine_type;
@@ -2270,25 +2270,25 @@ drop table t1, t2, t3;
 # 3) CREATE ... SELECT
 
 connect (a,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (b,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (c,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (d,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (e,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (f,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (g,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (h,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (i,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (j,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connection a;
 create table t1(a int not null, b int, primary key(a));
 insert into t1 values (1,2),(5,3),(4,2);

=== modified file 'mysql-test/include/query_cache.inc'
--- a/mysql-test/include/query_cache.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/include/query_cache.inc	2010-10-25 09:20:53 +0000
@@ -12,7 +12,7 @@
 #               main code went into include/query_cache.inc
 #
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 # Initialise
 --disable_warnings
@@ -106,7 +106,7 @@ eval set GLOBAL query_cache_size=$save_q
 
 # Establish connection1
 connect (connection1,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 SET @@autocommit=1;
 
 connection default;
@@ -117,7 +117,7 @@ SHOW VARIABLES LIKE 'have_query_cache';
 SET GLOBAL query_cache_size = 204800;
 flush status;
 SET @@autocommit=1;
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1));
 INSERT INTO t2 VALUES (1,repeat('a',10)),(2,repeat('a',10)),(3,repeat('a',10)),(4,repeat('a',10));
 COMMIT;

=== modified file 'mysql-test/include/read_many_rows.inc'
--- a/mysql-test/include/read_many_rows.inc	2007-08-05 05:36:54 +0000
+++ b/mysql-test/include/read_many_rows.inc	2010-10-25 09:20:53 +0000
@@ -19,7 +19,7 @@
 #               main code t/innodb-big.test --> include/read_many_rows.inc
 #
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2, t3, t4;

=== modified file 'mysql-test/include/rowid_order.inc'
--- a/mysql-test/include/rowid_order.inc	2006-08-16 17:29:49 +0000
+++ b/mysql-test/include/rowid_order.inc	2010-10-25 09:20:53 +0000
@@ -16,7 +16,7 @@
 #               main code went into include/rowid_order.inc
 #
 
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 
 --disable_warnings
 drop table if exists t1, t2, t3,t4;

=== modified file 'mysql-test/include/select.inc'
--- a/mysql-test/include/select.inc	2010-09-10 09:23:27 +0000
+++ b/mysql-test/include/select.inc	2010-10-25 09:20:53 +0000
@@ -1413,9 +1413,9 @@ drop table tmp;
 
 # big table done
 
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
 select distinct fld5 from t2 limit 10;
 
@@ -1424,9 +1424,9 @@ select distinct fld5 from t2 limit 10;
 #
 
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
-SET SQL_BIG_TABLES=1; # Force use of MyISAM
+SET BIG_TABLES=1; # Force use of MyISAM
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
 
 #

=== modified file 'mysql-test/include/unsafe_binlog.inc'
--- a/mysql-test/include/unsafe_binlog.inc	2007-06-12 12:53:16 +0000
+++ b/mysql-test/include/unsafe_binlog.inc	2010-10-25 09:20:53 +0000
@@ -145,15 +145,15 @@ connect (a,localhost,root,,);
 connect (b,localhost,root,,);
 connect (c,localhost,root,,);
 connect (d,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (e,localhost,root,,);
 connect (f,localhost,root,,);
 connect (g,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connect (h,localhost,root,,);
 connect (i,localhost,root,,);
 connect (j,localhost,root,,);
-eval SET SESSION STORAGE_ENGINE = $engine_type;
+eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
 connection a;
 eval create table t1(a int not null, b int, primary key(a)) engine = $engine_type;
 insert into t1 values (1,2),(5,3),(4,2);

=== modified file 'mysql-test/r/archive.result'
--- a/mysql-test/r/archive.result	2010-08-31 06:28:15 +0000
+++ b/mysql-test/r/archive.result	2010-10-25 09:20:53 +0000
@@ -1,6 +1,6 @@
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 DROP TABLE if exists t1,t2,t3,t4,t5,t6;
-SET storage_engine=ARCHIVE;
+SET default_storage_engine=ARCHIVE;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
 Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL

=== modified file 'mysql-test/r/archive_gis.result'
--- a/mysql-test/r/archive_gis.result	2010-06-09 14:16:33 +0000
+++ b/mysql-test/r/archive_gis.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET storage_engine=archive;
+SET default_storage_engine=archive;
 DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);
 CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);

=== modified file 'mysql-test/r/cache_innodb.result'
--- a/mysql-test/r/cache_innodb.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/r/cache_innodb.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 drop table if exists t1,t2,t3;
 flush status;
 set autocommit=0;
@@ -128,7 +128,7 @@ select t1.* from t1, t2, t3 where t3.sta
 id	a
 1	me
 drop table t3,t2,t1;
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 SET @@autocommit=1;
 connection default
 SHOW VARIABLES LIKE 'have_query_cache';
@@ -137,7 +137,7 @@ have_query_cache	YES
 SET GLOBAL query_cache_size = 204800;
 flush status;
 SET @@autocommit=1;
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1));
 INSERT INTO t2 VALUES (1,repeat('a',10)),(2,repeat('a',10)),(3,repeat('a',10)),(4,repeat('a',10));
 COMMIT;

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2010-08-18 09:35:41 +0000
+++ b/mysql-test/r/commit_1innodb.result	2010-10-25 09:20:53 +0000
@@ -1,6 +1,6 @@
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 set sql_mode=no_engine_substitution;
-set storage_engine = InnoDB;
+set default_storage_engine = InnoDB;
 set autocommit=1;
 drop table if exists t1;
 drop table if exists t2;

=== modified file 'mysql-test/r/compress.result'
--- a/mysql-test/r/compress.result	2010-06-09 14:16:33 +0000
+++ b/mysql-test/r/compress.result	2010-10-25 09:20:53 +0000
@@ -514,7 +514,7 @@ insert into tmp select * from t3;
 insert into t3 select * from tmp;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
 namn
 Abraham Abraham
@@ -527,7 +527,7 @@ ammonium ammonium
 analyzable analyzable
 animals animals
 animized animized
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
 concat(fld3," ",fld3)
 Abraham Abraham
@@ -564,7 +564,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
 fld3	count(*)
 affixed	1
@@ -577,7 +577,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
 fld3	repeat("a",length(fld3))	count(*)
 circus	aaaaaa	1

=== modified file 'mysql-test/r/concurrent_innodb_safelog.result'
--- a/mysql-test/r/concurrent_innodb_safelog.result	2009-05-15 10:15:56 +0000
+++ b/mysql-test/r/concurrent_innodb_safelog.result	2010-10-25 09:20:53 +0000
@@ -14,7 +14,7 @@ drop table if exists t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -153,7 +153,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -291,7 +291,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1 (a int not null, b int not null);
 insert into t1 values (1,1),(2,1),(3,1),(4,1);
 ** Create ULL 'hello2'
@@ -340,7 +340,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -443,7 +443,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -547,7 +547,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -634,7 +634,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -711,7 +711,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");

=== modified file 'mysql-test/r/concurrent_innodb_unsafelog.result'
--- a/mysql-test/r/concurrent_innodb_unsafelog.result	2009-05-15 10:15:56 +0000
+++ b/mysql-test/r/concurrent_innodb_unsafelog.result	2010-10-25 09:20:53 +0000
@@ -14,7 +14,7 @@ drop table if exists t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -152,7 +152,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -289,7 +289,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1 (a int not null, b int not null);
 insert into t1 values (1,1),(2,1),(3,1),(4,1);
 ** Create ULL 'hello2'
@@ -338,7 +338,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -441,7 +441,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -544,7 +544,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -631,7 +631,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -708,7 +708,7 @@ drop table t1;
 **
 ** connection thread1
 ** Set up table
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(eta int(11) not null, tipo int(11), c varchar(255));
 insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");

=== modified file 'mysql-test/r/create.result'
--- a/mysql-test/r/create.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/create.result	2010-10-25 09:20:53 +0000
@@ -225,9 +225,9 @@ select * from t1;
 if('2002'='2002','Y','N')
 Y
 drop table if exists t1;
-SET SESSION storage_engine="heap";
-SELECT @@storage_engine;
-@@storage_engine
+SET SESSION default_storage_engine="heap";
+SELECT @@default_storage_engine;
+@@default_storage_engine
 MEMORY
 CREATE TABLE t1 (a int not null);
 show create table t1;
@@ -236,10 +236,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 drop table t1;
-SET SESSION storage_engine="gemini";
+SET SESSION default_storage_engine="gemini";
 ERROR 42000: Unknown storage engine 'gemini'
-SELECT @@storage_engine;
-@@storage_engine
+SELECT @@default_storage_engine;
+@@default_storage_engine
 MEMORY
 CREATE TABLE t1 (a int not null);
 show create table t1;
@@ -247,7 +247,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-SET SESSION storage_engine=default;
+SET SESSION default_storage_engine=default;
 drop table t1;
 create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2));
 insert into t1 values ("a", 1), ("b", 2);
@@ -389,9 +389,9 @@ create temporary table t3 like t2;
 ERROR HY000: Table 't2' was not locked with LOCK TABLES
 unlock tables;
 drop tables t1, t2;
-SET SESSION storage_engine="heap";
-SELECT @@storage_engine;
-@@storage_engine
+SET SESSION default_storage_engine="heap";
+SELECT @@default_storage_engine;
+@@default_storage_engine
 MEMORY
 CREATE TABLE t1 (a int not null);
 show create table t1;
@@ -400,10 +400,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 drop table t1;
-SET SESSION storage_engine="gemini";
+SET SESSION default_storage_engine="gemini";
 ERROR 42000: Unknown storage engine 'gemini'
-SELECT @@storage_engine;
-@@storage_engine
+SELECT @@default_storage_engine;
+@@default_storage_engine
 MEMORY
 CREATE TABLE t1 (a int not null);
 show create table t1;
@@ -411,7 +411,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-SET SESSION storage_engine=default;
+SET SESSION default_storage_engine=default;
 drop table t1;
 create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);
 insert into t1(a)values(1);

=== modified file 'mysql-test/r/deadlock_innodb.result'
--- a/mysql-test/r/deadlock_innodb.result	2007-08-27 13:19:58 +0000
+++ b/mysql-test/r/deadlock_innodb.result	2010-10-25 09:20:53 +0000
@@ -113,7 +113,7 @@ commit;
 # Switch to connection default + disconnect con1 and con2
 drop table t1, t2;
 End of 4.1 tests
-set storage_engine=innodb;
+set default_storage_engine=innodb;
 drop table if exists a;
 drop table if exists A;
 create table A (c int);
@@ -121,5 +121,5 @@ insert into A (c) values (0);
 create table a as select * from A;
 drop table A;
 drop table if exists a;
-set storage_engine=default;
+set default_storage_engine=default;
 End of 5.0 tests.

=== modified file 'mysql-test/r/group_by.result'
--- a/mysql-test/r/group_by.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/group_by.result	2010-10-25 09:20:53 +0000
@@ -359,7 +359,7 @@ A	4
 B	4
 a	1
 b	1
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 SELECT a FROM t1 GROUP BY a;
 a
 NULL
@@ -398,7 +398,7 @@ A	4
 B	4
 a	1
 b	1
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 drop table t1;
 CREATE TABLE t1 (
 `a` char(193) default NULL,
@@ -512,7 +512,7 @@ a	count(*)
 NULL	9
 	3
 b	1
-set option sql_big_tables=1;
+set option big_tables=1;
 select a,count(*) from t1 group by a;
 a	count(*)
 NULL	9

=== modified file 'mysql-test/r/handler_innodb.result'
--- a/mysql-test/r/handler_innodb.result	2010-08-30 06:38:09 +0000
+++ b/mysql-test/r/handler_innodb.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 drop table if exists t1,t3,t4,t5;
 create table t1 (a int, b char(10), key a(a), key b(a,b));
 insert into t1 values

=== modified file 'mysql-test/r/handler_myisam.result'
--- a/mysql-test/r/handler_myisam.result	2010-08-30 06:38:09 +0000
+++ b/mysql-test/r/handler_myisam.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = MyISAM;
+SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM;
 drop table if exists t1,t3,t4,t5;
 create table t1 (a int, b char(10), key a(a), key b(a,b));
 insert into t1 values

=== modified file 'mysql-test/r/heap.result'
--- a/mysql-test/r/heap.result	2010-04-20 07:22:51 +0000
+++ b/mysql-test/r/heap.result	2010-10-25 09:20:53 +0000
@@ -249,7 +249,7 @@ a
 3
 2
 drop table t1;
-set storage_engine=HEAP;
+set default_storage_engine=HEAP;
 create table t1 (v varchar(10), c char(10), t varchar(50));
 insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
@@ -664,7 +664,7 @@ select length(v) from t1 where v=repeat(
 length(v)
 65530
 drop table t1;
-set storage_engine=MyISAM;
+set default_storage_engine=MyISAM;
 create table t1 (a bigint unsigned auto_increment primary key, b int,
 key (b, a)) engine=heap;
 insert t1 (b) values (1),(1),(1),(1),(1),(1),(1),(1);

=== modified file 'mysql-test/r/index_merge_innodb.result'
--- a/mysql-test/r/index_merge_innodb.result	2010-09-16 12:20:35 +0000
+++ b/mysql-test/r/index_merge_innodb.result	2010-10-25 09:20:53 +0000
@@ -1,5 +1,5 @@
 #---------------- 2-sweeps read Index merge test 2 -------------------------------
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 drop table if exists t1;
 create table t1 (
 pk int primary key,
@@ -137,7 +137,7 @@ pk	key1	key2	filler	filler2
 54	54	54	filler-data	filler-data-2
 drop table t1;
 #---------------- Clustered PK ROR-index_merge tests -----------------------------
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 drop table if exists  t1;
 create table t1
 (

=== modified file 'mysql-test/r/index_merge_myisam.result'
--- a/mysql-test/r/index_merge_myisam.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/index_merge_myisam.result	2010-10-25 09:20:53 +0000
@@ -1,5 +1,5 @@
 #---------------- Index merge test 1 -------------------------------------------
-SET SESSION STORAGE_ENGINE = MyISAM;
+SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM;
 drop table if exists t0, t1, t2, t3, t4;
 create table t0
 (
@@ -581,7 +581,7 @@ SET SESSION sort_buffer_size=DEFAULT;
 DROP TABLE t1;
 End of 5.0 tests
 #---------------- ROR-index_merge tests -----------------------
-SET SESSION STORAGE_ENGINE = MyISAM;
+SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM;
 drop table if exists  t0,t1,t2;
 create table t1
 (
@@ -831,7 +831,7 @@ SELECT * FROM t1;
 c1	c2	c3
 DROP TABLE t1,t2;
 #---------------- Index merge test 2 -------------------------------------------
-SET SESSION STORAGE_ENGINE = MyISAM;
+SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM;
 drop table if exists t1,t2;
 create table t1
 (
@@ -1157,7 +1157,7 @@ key1	key2	key3
 39	39	39
 drop table t1;
 #---------------- 2-sweeps read Index merge test 2 -------------------------------
-SET SESSION STORAGE_ENGINE = MyISAM;
+SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM;
 drop table if exists t1;
 create table t1 (
 pk int primary key,
@@ -1295,7 +1295,7 @@ pk	key1	key2	filler	filler2
 1	1	1	filler-data	filler-data-2
 drop table t1;
 #---------------- Clustered PK ROR-index_merge tests -----------------------------
-SET SESSION STORAGE_ENGINE = MyISAM;
+SET SESSION DEFAULT_STORAGE_ENGINE = MyISAM;
 drop table if exists  t1;
 create table t1
 (

=== modified file 'mysql-test/r/innodb_icp_none.result'
--- a/mysql-test/r/innodb_icp_none.result	2010-09-01 13:46:08 +0000
+++ b/mysql-test/r/innodb_icp_none.result	2010-10-25 09:20:53 +0000
@@ -1,5 +1,5 @@
-set @save_storage_engine= @@storage_engine;
-set storage_engine=InnoDB;
+set @save_storage_engine= @@default_storage_engine;
+set default_storage_engine=InnoDB;
 #
 # Bug#36981 - "innodb crash when selecting for update"
 #
@@ -367,5 +367,5 @@ ORDER BY f1;
 f1
 b
 DROP TABLE t1;
-set storage_engine= @save_storage_engine;
+set default_storage_engine= @save_storage_engine;
 set optimizer_switch=default;

=== modified file 'mysql-test/r/innodb_mrr_none.result'
--- a/mysql-test/r/innodb_mrr_none.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/innodb_mrr_none.result	2010-10-25 09:20:53 +0000
@@ -1,5 +1,5 @@
-set @save_storage_engine= @@storage_engine;
-set storage_engine=InnoDB;
+set @save_storage_engine= @@default_storage_engine;
+set default_storage_engine=InnoDB;
 create table t1(a int);
 show create table t1;
 Table	Create Table
@@ -557,5 +557,5 @@ ROLLBACK;
 ROLLBACK;
 DROP TABLE t1;
 COMMIT;
-set storage_engine= @save_storage_engine;
+set default_storage_engine= @save_storage_engine;
 set optimizer_switch=default;

=== modified file 'mysql-test/r/loaddata_autocom_innodb.result'
--- a/mysql-test/r/loaddata_autocom_innodb.result	2007-12-12 17:19:24 +0000
+++ b/mysql-test/r/loaddata_autocom_innodb.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 drop table if exists t1;
 create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
 start transaction;

=== modified file 'mysql-test/r/log_state.result'
--- a/mysql-test/r/log_state.result	2010-06-26 07:43:14 +0000
+++ b/mysql-test/r/log_state.result	2010-10-25 09:20:53 +0000
@@ -199,7 +199,7 @@ SELECT @@general_log, @@log;
 1	1
 SET GLOBAL log = 0;
 Warnings:
-Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+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
@@ -230,7 +230,7 @@ SELECT @@slow_query_log, @@log_slow_quer
 0	0
 SET GLOBAL log_slow_queries = 0;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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
@@ -283,16 +283,16 @@ SET GLOBAL slow_query_log_file = @old_sl
 deprecated:
 SET GLOBAL log = 0;
 Warnings:
-Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+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	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+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	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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;

=== modified file 'mysql-test/r/log_tables.result'
--- a/mysql-test/r/log_tables.result	2010-10-08 16:11:32 +0000
+++ b/mysql-test/r/log_tables.result	2010-10-25 09:20:53 +0000
@@ -245,14 +245,14 @@ lock tables mysql.slow_log READ;
 ERROR HY000: You can't use locks with log tables.
 set global general_log='OFF';
 set global slow_query_log='OFF';
-set @save_storage_engine= @@session.storage_engine;
-set storage_engine= MEMORY;
+set @save_storage_engine= @@session.default_storage_engine;
+set default_storage_engine= MEMORY;
 alter table mysql.slow_log engine=NonExistentEngine;
 Warnings:
 Warning	1286	Unknown storage engine 'NonExistentEngine'
 alter table mysql.slow_log engine=memory;
 ERROR HY000: This storage engine cannot be used for log tables"
-set storage_engine= @save_storage_engine;
+set default_storage_engine= @save_storage_engine;
 drop table mysql.slow_log;
 drop table mysql.general_log;
 drop table mysql.general_log;

=== modified file 'mysql-test/r/merge.result'
--- a/mysql-test/r/merge.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/merge.result	2010-10-25 09:20:53 +0000
@@ -1,5 +1,5 @@
-set global storage_engine=myisam;
-set session storage_engine=myisam;
+set global default_storage_engine=myisam;
+set session default_storage_engine=myisam;
 drop table if exists t1,t2,t3,t4,t5,t6;
 drop database if exists mysqltest;
 create table t1 (a int not null primary key auto_increment, message char(20));

=== modified file 'mysql-test/r/merge_mmap.result'
--- a/mysql-test/r/merge_mmap.result	2010-07-02 16:07:57 +0000
+++ b/mysql-test/r/merge_mmap.result	2010-10-25 09:20:53 +0000
@@ -1,5 +1,5 @@
-SET GLOBAL storage_engine = MyISAM;
-SET SESSION storage_engine = MyISAM;
+SET GLOBAL default_storage_engine = MyISAM;
+SET SESSION default_storage_engine = MyISAM;
 DROP TABLE IF EXISTS t1, t2, m1, m2;
 CREATE TABLE t1 (c1 INT);
 CREATE TABLE t2 (c1 INT);

=== modified file 'mysql-test/r/mix2_myisam.result'
--- a/mysql-test/r/mix2_myisam.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/mix2_myisam.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = MEMORY;
+SET SESSION DEFAULT_STORAGE_ENGINE = MEMORY;
 drop table if exists t1,t2,t3,t4;
 drop database if exists mysqltest;
 create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) engine=MyISAM;
@@ -1405,7 +1405,7 @@ select count(*) from t1 where x = 184467
 count(*)
 1
 drop table t1;
-set storage_engine=MyISAM;
+set default_storage_engine=MyISAM;
 drop table if exists t1,t2,t3;
 --- Testing varchar ---
 --- Testing varchar ---
@@ -1999,7 +1999,7 @@ t1	CREATE TABLE `t1` (
   `v` mediumtext CHARACTER SET utf8
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
-set storage_engine=MEMORY;
+set default_storage_engine=MEMORY;
 create table t1 (v varchar(16384)) engine=MyISAM;
 drop table t1;
 create table t1 (a char(1), b char(1), key(a, b)) engine=MyISAM;

=== modified file 'mysql-test/r/myisam.result'
--- a/mysql-test/r/myisam.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/r/myisam.result	2010-10-25 09:20:53 +0000
@@ -1079,6 +1079,8 @@ length(c1)	c1
 DROP TABLE t1;
 End of 4.1 tests
 set storage_engine=MyISAM;
+Warnings:
+Warning	1287	'@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead
 drop table if exists t1,t2,t3;
 --- Testing varchar ---
 --- Testing varchar ---
@@ -1675,6 +1677,8 @@ drop table t1;
 create table t1 (v varchar(65535));
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
 set storage_engine=MyISAM;
+Warnings:
+Warning	1287	'@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead
 set @save_concurrent_insert=@@concurrent_insert;
 set global concurrent_insert=1;
 create table t1 (a int);

=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2010-10-22 13:33:24 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2010-10-25 09:20:53 +0000
@@ -212,7 +212,7 @@ The following options may be given as th
  a full path. Deprecated. Use --lc-messages-dir instead.
  --large-pages       Enable support for large pages
  --lc-messages=name  Set the language used for the error messages.
- -L, --lc-messages-dir=name 
+ --lc-messages-dir=name 
  Directory where error messages are
  --lc-time-names=name 
  Set the language used for the month names and the days of
@@ -287,7 +287,8 @@ The following options may be given as th
  information.
  --master-retry-count=# 
  The number of tries the slave will make to connect to the
- master before giving up.
+ master before giving up. Deprecated option, use 'CHANGE
+ MASTER TO master_retry_count = <num>' instead.
  --max-allowed-packet=# 
  Max packet length to send to or receive from the server
  --max-binlog-cache-size=# 

=== modified file 'mysql-test/r/mysqldump-max.result'
--- a/mysql-test/r/mysqldump-max.result	2009-02-19 17:22:28 +0000
+++ b/mysql-test/r/mysqldump-max.result	2010-10-25 09:20:53 +0000
@@ -277,8 +277,8 @@ drop table t3;
 drop table t4;
 drop table t5;
 drop table t6;
-SELECT @@global.storage_engine INTO @old_engine;
-SET GLOBAL storage_engine=InnoDB;
+SELECT @@global.default_storage_engine INTO @old_engine;
+SET GLOBAL default_storage_engine=InnoDB;
 CREATE VIEW v1 AS SELECT * FROM t1;
 INSERT INTO t1 VALUES();
 SELECT COUNT(*) FROM v1;
@@ -289,4 +289,4 @@ COUNT(*)
 1
 DROP VIEW  v1;
 DROP TABLE t1;
-SET GLOBAL storage_engine=@old_engine;
+SET GLOBAL default_storage_engine=@old_engine;

=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2010-09-28 15:17:29 +0000
+++ b/mysql-test/r/partition.result	2010-10-25 09:20:53 +0000
@@ -917,13 +917,13 @@ select * from t1 where f1 = 10;
 f1	f2
 10	1
 drop table t1;
-set session storage_engine= 'memory';
+set session default_storage_engine= 'memory';
 create table t1 (f_int1 int(11) default null) engine = memory
 partition by range (f_int1) subpartition by hash (f_int1)
 (partition part1 values less than (1000)
 (subpartition subpart11 engine = memory));
 drop table t1;
-set session storage_engine='myisam';
+set session default_storage_engine='myisam';
 create table t1 (f_int1 integer, f_int2 integer, primary key (f_int1))
 partition by hash(f_int1) partitions 2;
 insert into t1 values (1,1),(2,2);

=== modified file 'mysql-test/r/rowid_order_innodb.result'
--- a/mysql-test/r/rowid_order_innodb.result	2010-08-17 06:25:08 +0000
+++ b/mysql-test/r/rowid_order_innodb.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 drop table if exists t1, t2, t3,t4;
 create table t1 (
 pk1 int not NULL,

=== modified file 'mysql-test/r/select_none.result'
--- a/mysql-test/r/select_none.result	2010-09-28 15:17:29 +0000
+++ b/mysql-test/r/select_none.result	2010-10-25 09:20:53 +0000
@@ -510,7 +510,7 @@ insert into tmp select * from t3;
 insert into t3 select * from tmp;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
 namn
 Abraham Abraham
@@ -523,7 +523,7 @@ ammonium ammonium
 analyzable analyzable
 animals animals
 animized animized
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
 concat(fld3," ",fld3)
 Abraham Abraham
@@ -560,7 +560,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
 fld3	count(*)
 affixed	1
@@ -573,7 +573,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
 fld3	repeat("a",length(fld3))	count(*)
 circus	aaaaaa	1

=== modified file 'mysql-test/r/ssl.result'
--- a/mysql-test/r/ssl.result	2010-06-09 14:16:33 +0000
+++ b/mysql-test/r/ssl.result	2010-10-25 09:20:53 +0000
@@ -511,7 +511,7 @@ insert into tmp select * from t3;
 insert into t3 select * from tmp;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
 namn
 Abraham Abraham
@@ -524,7 +524,7 @@ ammonium ammonium
 analyzable analyzable
 animals animals
 animized animized
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
 concat(fld3," ",fld3)
 Abraham Abraham
@@ -561,7 +561,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
 fld3	count(*)
 affixed	1
@@ -574,7 +574,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
 fld3	repeat("a",length(fld3))	count(*)
 circus	aaaaaa	1

=== modified file 'mysql-test/r/ssl_compress.result'
--- a/mysql-test/r/ssl_compress.result	2010-06-09 14:16:33 +0000
+++ b/mysql-test/r/ssl_compress.result	2010-10-25 09:20:53 +0000
@@ -514,7 +514,7 @@ insert into tmp select * from t3;
 insert into t3 select * from tmp;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
 namn
 Abraham Abraham
@@ -527,7 +527,7 @@ ammonium ammonium
 analyzable analyzable
 animals animals
 animized animized
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
 concat(fld3," ",fld3)
 Abraham Abraham
@@ -564,7 +564,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
 fld3	count(*)
 affixed	1
@@ -577,7 +577,7 @@ attendants	1
 bedlam	1
 bedpost	1
 boasted	1
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
 fld3	repeat("a",length(fld3))	count(*)
 circus	aaaaaa	1

=== modified file 'mysql-test/r/type_blob.result'
--- a/mysql-test/r/type_blob.result	2010-03-20 09:35:40 +0000
+++ b/mysql-test/r/type_blob.result	2010-10-25 09:20:53 +0000
@@ -232,7 +232,7 @@ HELLO
 HELLO MY
 a
 hello
-set option sql_big_tables=1;
+set option big_tables=1;
 select distinct t from t1;
 t
 NULL
@@ -313,7 +313,7 @@ HELLO
 HELLO MY
 a
 hello
-set option sql_big_tables=0;
+set option big_tables=0;
 select distinct * from t1;
 t	c	b	d
 NULL	NULL	NULL	NULL

=== modified file 'mysql-test/r/unsafe_binlog_innodb.result'
--- a/mysql-test/r/unsafe_binlog_innodb.result	2007-06-12 12:53:16 +0000
+++ b/mysql-test/r/unsafe_binlog_innodb.result	2010-10-25 09:20:53 +0000
@@ -65,9 +65,9 @@ select * from t2;
 commit;
 commit;
 drop table t1, t2, t3;
-SET SESSION STORAGE_ENGINE = InnoDB;
-SET SESSION STORAGE_ENGINE = InnoDB;
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 create table t1(a int not null, b int, primary key(a)) engine = InnoDB;
 insert into t1 values (1,2),(5,3),(4,2);
 create table t2(a int not null, b int, primary key(a)) engine = InnoDB;

=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2010-09-20 12:12:36 +0000
+++ b/mysql-test/r/variables.result	2010-10-25 09:20:53 +0000
@@ -564,10 +564,14 @@ select @@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;

=== modified file 'mysql-test/suite/innodb/r/innodb.result'
--- a/mysql-test/suite/innodb/r/innodb.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/suite/innodb/r/innodb.result	2010-10-25 09:20:53 +0000
@@ -1755,7 +1755,7 @@ set global innodb_thread_sleep_delay=100
 show variables like "innodb_thread_sleep_delay";
 Variable_name	Value
 innodb_thread_sleep_delay	10000
-set storage_engine=INNODB;
+set default_storage_engine=INNODB;
 set session old_alter_table=1;
 drop table if exists t1,t2,t3;
 --- Testing varchar ---
@@ -2353,7 +2353,7 @@ t1	CREATE TABLE `t1` (
   `v` mediumtext CHARACTER SET utf8
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
-set storage_engine=MyISAM;
+set default_storage_engine=MyISAM;
 create table t1 (v varchar(16384)) engine=innodb;
 drop table t1;
 create table t1 (a char(1), b char(1), key(a, b)) engine=innodb;

=== modified file 'mysql-test/suite/innodb/r/innodb_bug34053.result'
--- a/mysql-test/suite/innodb/r/innodb_bug34053.result	2010-07-16 21:00:50 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug34053.result	2010-10-25 09:20:53 +0000
@@ -1 +1 @@
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;

=== modified file 'mysql-test/suite/innodb/r/innodb_bug35220.result'
--- a/mysql-test/suite/innodb/r/innodb_bug35220.result	2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug35220.result	2010-10-25 09:20:53 +0000
@@ -1 +1 @@
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;

=== modified file 'mysql-test/suite/innodb/r/innodb_bug36172.result'
--- a/mysql-test/suite/innodb/r/innodb_bug36172.result	2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug36172.result	2010-10-25 09:20:53 +0000
@@ -1 +1 @@
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;

=== modified file 'mysql-test/suite/innodb/r/innodb_bug38231.result'
--- a/mysql-test/suite/innodb/r/innodb_bug38231.result	2010-06-06 11:19:29 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug38231.result	2010-10-25 09:20:53 +0000
@@ -1 +1 @@
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;

=== modified file 'mysql-test/suite/innodb/r/innodb_bug39438.result'
--- a/mysql-test/suite/innodb/r/innodb_bug39438.result	2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug39438.result	2010-10-25 09:20:53 +0000
@@ -1 +1 @@
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;

=== modified file 'mysql-test/suite/innodb/r/innodb_gis.result'
--- a/mysql-test/suite/innodb/r/innodb_gis.result	2010-08-18 08:09:36 +0000
+++ b/mysql-test/suite/innodb/r/innodb_gis.result	2010-10-25 09:20:53 +0000
@@ -1,4 +1,4 @@
-SET storage_engine=innodb;
+SET default_storage_engine=innodb;
 DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);
 CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);

=== modified file 'mysql-test/suite/innodb/r/innodb_mysql.result'
--- a/mysql-test/suite/innodb/r/innodb_mysql.result	2010-10-22 08:36:12 +0000
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result	2010-10-25 09:20:53 +0000
@@ -1,6 +1,6 @@
 set global innodb_support_xa=default;
 set session innodb_support_xa=default;
-SET SESSION STORAGE_ENGINE = InnoDB;
+SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB;
 drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
 drop procedure if exists p1;
 create table t1 (

=== modified file 'mysql-test/suite/innodb/r/innodb_trx_weight.result'
--- a/mysql-test/suite/innodb/r/innodb_trx_weight.result	2010-07-16 21:00:50 +0000
+++ b/mysql-test/suite/innodb/r/innodb_trx_weight.result	2010-10-25 09:20:53 +0000
@@ -1 +1 @@
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;

=== modified file 'mysql-test/suite/innodb/t/innodb.test'
--- a/mysql-test/suite/innodb/t/innodb.test	2010-07-16 21:00:50 +0000
+++ b/mysql-test/suite/innodb/t/innodb.test	2010-10-25 09:20:53 +0000
@@ -1364,8 +1364,8 @@ show variables like "innodb_thread_sleep
 # Test varchar
 #
 
-let $default=`select @@storage_engine`;
-set storage_engine=INNODB;
+let $default=`select @@default_storage_engine`;
+set default_storage_engine=INNODB;
 # this should be fixed by MySQL (see Bug #51451)
 set session old_alter_table=1;
 source include/varchar.inc;
@@ -1386,7 +1386,7 @@ create table t1 (v varchar(65530) charac
 show create table t1;
 drop table t1;
 
-eval set storage_engine=$default;
+eval set default_storage_engine=$default;
 
 # InnoDB specific varchar tests
 create table t1 (v varchar(16384)) engine=innodb;

=== modified file 'mysql-test/suite/innodb/t/innodb_bug34053.test'
--- a/mysql-test/suite/innodb/t/innodb_bug34053.test	2010-07-16 21:00:50 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug34053.test	2010-10-25 09:20:53 +0000
@@ -5,7 +5,7 @@
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we do not really care about what gets printed, we are only
 # interested in getting success or failure according to our

=== modified file 'mysql-test/suite/innodb/t/innodb_bug35220.test'
--- a/mysql-test/suite/innodb/t/innodb_bug35220.test	2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug35220.test	2010-10-25 09:20:53 +0000
@@ -5,7 +5,7 @@
 
 -- source include/have_innodb.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not produce errors
 -- disable_query_log

=== modified file 'mysql-test/suite/innodb/t/innodb_bug36172.test'
--- a/mysql-test/suite/innodb/t/innodb_bug36172.test	2010-06-17 09:13:53 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug36172.test	2010-10-25 09:20:53 +0000
@@ -5,7 +5,7 @@
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we do not really care about what gets printed, we are only
 # interested in getting success or failure according to our

=== modified file 'mysql-test/suite/innodb/t/innodb_bug38231.test'
--- a/mysql-test/suite/innodb/t/innodb_bug38231.test	2010-06-06 11:19:29 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug38231.test	2010-10-25 09:20:53 +0000
@@ -10,7 +10,7 @@
 # preceded by --send
 -- source include/not_embedded.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not crash the server
 -- disable_query_log

=== modified file 'mysql-test/suite/innodb/t/innodb_bug39438.test'
--- a/mysql-test/suite/innodb/t/innodb_bug39438.test	2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug39438.test	2010-10-25 09:20:53 +0000
@@ -9,7 +9,7 @@
 
 -- source include/have_innodb.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not crash the server
 -- disable_query_log

=== modified file 'mysql-test/suite/innodb/t/innodb_gis.test'
--- a/mysql-test/suite/innodb/t/innodb_gis.test	2010-07-05 09:35:24 +0000
+++ b/mysql-test/suite/innodb/t/innodb_gis.test	2010-10-25 09:20:53 +0000
@@ -1,5 +1,5 @@
 --source include/have_innodb.inc
-SET storage_engine=innodb;
+SET default_storage_engine=innodb;
 --source include/gis_generic.inc
 --source include/gis_keys.inc
 

=== modified file 'mysql-test/suite/innodb/t/innodb_trx_weight.test'
--- a/mysql-test/suite/innodb/t/innodb_trx_weight.test	2010-07-16 21:00:50 +0000
+++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test	2010-10-25 09:20:53 +0000
@@ -8,7 +8,7 @@
 
 -- source include/have_innodb.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we do not really care about what gets printed, we are only
 # interested in getting the deadlock resolved according to our

=== modified 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-22 08:36:12 +0000
+++ b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result	2010-10-25 09:20:53 +0000
@@ -13,26 +13,26 @@ index_merge=on,index_merge_union=on,inde
 '#--------------------FN_DYNVARS_028_01------------------------#'
 SET @@session.engine_condition_pushdown = 0;
 Warnings:
-Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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
@@ -44,38 +44,38 @@ SELECT global.engine_condition_pushdown;
 ERROR 42S02: Unknown table 'global' in field list
 SET session engine_condition_pushdown = 0;
 Warnings:
-Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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
@@ -115,16 +115,16 @@ ERROR 42000: Variable 'engine_condition_
 '#-------------------FN_DYNVARS_028_05----------------------------#'
 SET @@global.engine_condition_pushdown = 0;
 Warnings:
-Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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
@@ -159,50 +159,50 @@ ON
 '#---------------------FN_DYNVARS_028_08-------------------------#'
 SET @@session.engine_condition_pushdown = OFF;
 Warnings:
-Warning	1287	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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
@@ -215,7 +215,7 @@ select @@session.engine_condition_pushdo
 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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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;
@@ -223,7 +223,7 @@ select @@session.engine_condition_pushdo
 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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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;
@@ -231,7 +231,7 @@ select @@session.engine_condition_pushdo
 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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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;
@@ -239,7 +239,7 @@ select @@session.engine_condition_pushdo
 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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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;
@@ -271,13 +271,13 @@ select @@session.engine_condition_pushdo
 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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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	The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead
+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

=== modified file 'mysql-test/suite/sys_vars/r/log_basic.result'
--- a/mysql-test/suite/sys_vars/r/log_basic.result	2010-02-24 13:52:27 +0000
+++ b/mysql-test/suite/sys_vars/r/log_basic.result	2010-10-25 09:20:53 +0000
@@ -8,10 +8,10 @@ INIT_VALUE
 1
 SET @@global.log = ON;
 Warnings:
-Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+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	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+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
@@ -20,4 +20,4 @@ VARIABLE_VALUE
 OFF
 SET @@global.log= @start_log;
 Warnings:
-Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+Warning	1287	'@@log' is deprecated and will be removed in a future release. Please use '@@general_log' instead

=== modified 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-01-29 06:33:00 +0000
+++ b/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result	2010-10-25 09:20:53 +0000
@@ -5,20 +5,20 @@ SELECT @start_value;
 '#---------------------FN_DYNVARS_004_01-------------------------#'
 SET @@global.log_slow_queries = DEFAULT;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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
@@ -61,7 +61,7 @@ IF(@@global.log_slow_queries, "ON", "OFF
 '#---------------------FN_DYNVARS_004_06----------------------#'
 SET @@global.log_slow_queries = 0;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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
@@ -72,7 +72,7 @@ IF(@@global.log_slow_queries, "ON", "OFF
 1
 SET @@global.log_slow_queries = 1;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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
@@ -84,7 +84,7 @@ IF(@@global.log_slow_queries, "ON", "OFF
 '#---------------------FN_DYNVARS_004_07----------------------#'
 SET @@global.log_slow_queries = TRUE;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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
@@ -95,7 +95,7 @@ IF(@@global.log_slow_queries, "ON", "OFF
 1
 SET @@global.log_slow_queries = FALSE;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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
@@ -107,7 +107,7 @@ IF(@@global.log_slow_queries, "ON", "OFF
 '#---------------------FN_DYNVARS_004_08----------------------#'
 SET @@global.log_slow_queries = ON;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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
@@ -126,7 +126,7 @@ SELECT log_slow_queries = @@session.log_
 ERROR 42S22: Unknown column 'log_slow_queries' in 'field list'
 SET @@global.log_slow_queries = @start_value;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+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	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result	2010-10-25 09:20:53 +0000
@@ -5,7 +5,7 @@ SET @session_max_join_size = @@SESSION.m
 SET @global_max_join_size = @@GLOBAL.max_join_size;
 SET SQL_MAX_JOIN_SIZE=9;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+Warning	1287	'@@sql_max_join_size' is deprecated and will be removed in a future release. Please use @@max_join_size instead
 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');

=== modified file 'mysql-test/suite/sys_vars/r/sql_big_tables_basic.result'
--- a/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result	2010-10-25 09:20:53 +0000
@@ -4,17 +4,27 @@ SELECT @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
@@ -23,15 +33,21 @@ ERROR 42S02: Unknown table 'session' in
 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
@@ -58,10 +74,14 @@ 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
@@ -87,23 +107,33 @@ 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

=== modified file 'mysql-test/suite/sys_vars/r/sql_big_tables_func.result'
--- a/mysql-test/suite/sys_vars/r/sql_big_tables_func.result	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_big_tables_func.result	2010-10-25 09:20:53 +0000
@@ -9,6 +9,8 @@ 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 
@@ -51,6 +53,8 @@ SELECT @tempTableCount;
 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;
@@ -98,6 +102,8 @@ SELECT @@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;
@@ -105,6 +111,8 @@ SELECT @@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
@@ -118,4 +126,6 @@ SELECT @@SESSION.sql_big_tables;
 ** 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;

=== modified 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	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result	2010-10-25 09:20:53 +0000
@@ -8,14 +8,24 @@ SELECT @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
@@ -26,27 +36,39 @@ ERROR 42S02: Unknown table 'local' in fi
 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
@@ -85,11 +107,17 @@ SET @@global.sql_low_priority_updates =
 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
@@ -123,43 +151,63 @@ 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

=== modified 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-01-29 06:33:00 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result	2010-10-25 09:20:53 +0000
@@ -22,10 +22,10 @@ VARIABLE_NAME	VARIABLE_VALUE
 SQL_MAX_JOIN_SIZE	18446744073709551615
 set global sql_max_join_size=10;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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
@@ -55,19 +55,19 @@ select @@sql_big_selects;
 0
 set sql_max_join_size=cast(-1 as unsigned int);
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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

=== modified 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	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result	2010-10-25 09:20:53 +0000
@@ -17,7 +17,7 @@ INSERT INTO t2 VALUES('aa4','bb');
 '#--------------------FN_DYNVARS_161_01-------------------------#'
 SET SESSION sql_max_join_size=9;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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.
@@ -33,7 +33,7 @@ aa4	bb	aa4	bb
 This should work
 SET SESSION sql_max_join_size=DEFAULT;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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
@@ -45,7 +45,7 @@ This should work
 '#----------------------------FN_DYNVARS_136_05-------------------------#'
 SET GLOBAL sql_max_join_size = 4;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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;
@@ -54,7 +54,7 @@ SELECT @@SESSION.sql_max_join_size;
 4 Expected
 SET SESSION sql_max_join_size = 2;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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;
@@ -63,7 +63,7 @@ SELECT @@SESSION.sql_max_join_size;
 4 Expected
 SET SESSION sql_max_join_size = 10;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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
@@ -82,10 +82,10 @@ SELECT @@GLOBAL.sql_max_join_size;
 Disconnecting Connections con_int1, con_int2
 SET @@SESSION.sql_max_join_size = @session_max_join_size;
 Warnings:
-Warning	1287	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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	The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0.
+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;

=== modified file 'mysql-test/suite/sys_vars/r/storage_engine_basic.result'
--- a/mysql-test/suite/sys_vars/r/storage_engine_basic.result	2010-06-21 07:58:54 +0000
+++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result	2010-10-25 09:20:53 +0000
@@ -1,117 +1,117 @@
-SET @start_global_value = @@global.storage_engine;
+SET @start_global_value = @@global.default_storage_engine;
 SELECT @start_global_value;
 @start_global_value
 InnoDB
-SET @start_session_value = @@session.storage_engine;
+SET @start_session_value = @@session.default_storage_engine;
 SELECT @start_session_value;
 @start_session_value
 InnoDB
 '#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.storage_engine = INNODB;
-SET @@global.storage_engine = DEFAULT;
-SELECT @@global.storage_engine;
-@@global.storage_engine
-InnoDB
-SET @@session.storage_engine = INNODB;
-SET @@session.storage_engine = DEFAULT;
-SELECT @@session.storage_engine;
-@@session.storage_engine
+SET @@global.default_storage_engine = INNODB;
+SET @@global.default_storage_engine = DEFAULT;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+InnoDB
+SET @@session.default_storage_engine = INNODB;
+SET @@session.default_storage_engine = DEFAULT;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
 InnoDB
 '#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.storage_engine = MYISAM;
-SELECT @@global.storage_engine;
-@@global.storage_engine
+SET @@global.default_storage_engine = MYISAM;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
 MyISAM
-SET @@global.storage_engine = MERGE;
-SELECT @@global.storage_engine;
-@@global.storage_engine
+SET @@global.default_storage_engine = MERGE;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
 MRG_MYISAM
-SET @@global.storage_engine = MEMORY;
-SELECT @@global.storage_engine;
-@@global.storage_engine
+SET @@global.default_storage_engine = MEMORY;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
 MEMORY
-SET @@global.storage_engine = INNODB;
-SELECT @@global.storage_engine;
-@@global.storage_engine
+SET @@global.default_storage_engine = INNODB;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
 InnoDB
 '#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@session.storage_engine = MYISAM;
-SELECT @@session.storage_engine;
-@@session.storage_engine
+SET @@session.default_storage_engine = MYISAM;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
 MyISAM
-SET @@session.storage_engine = MERGE;
-SELECT @@session.storage_engine;
-@@session.storage_engine
+SET @@session.default_storage_engine = MERGE;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
 MRG_MYISAM
-SET @@session.storage_engine = MEMORY;
-SELECT @@session.storage_engine;
-@@session.storage_engine
+SET @@session.default_storage_engine = MEMORY;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
 MEMORY
-SET @@session.storage_engine = INNODB;
-SELECT @@session.storage_engine;
-@@session.storage_engine
+SET @@session.default_storage_engine = INNODB;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
 InnoDB
 '#------------------FN_DYNVARS_005_04-----------------------#'
-SET @@global.storage_engine = 8199;
-ERROR 42000: Incorrect argument type to variable 'storage_engine'
-SET @@global.storage_engine = NULL;
-ERROR 42000: Variable 'storage_engine' can't be set to the value of 'NULL'
-SET @@global.storage_engine = -1024;
-ERROR 42000: Incorrect argument type to variable 'storage_engine'
-SET @@global.storage_engine = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'storage_engine'
-SET @@global.storage_engine = FILE;
+SET @@global.default_storage_engine = 8199;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = NULL;
+ERROR 42000: Variable 'default_storage_engine' can't be set to the value of 'NULL'
+SET @@global.default_storage_engine = -1024;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = FILE;
 ERROR 42000: Unknown storage engine 'FILE'
-SET @@session.storage_engine = 8199;
-ERROR 42000: Incorrect argument type to variable 'storage_engine'
-SET @@session.storage_engine = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'storage_engine'
-SET @@session.storage_engine = RECORD;
+SET @@session.default_storage_engine = 8199;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@session.default_storage_engine = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@session.default_storage_engine = RECORD;
 ERROR 42000: Unknown storage engine 'RECORD'
 '#------------------FN_DYNVARS_005_05-----------------------#'
-SELECT @@global.storage_engine =
+SELECT @@global.default_storage_engine =
 VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='storage_engine';
-@@global.storage_engine =
+WHERE VARIABLE_NAME='default_storage_engine';
+@@global.default_storage_engine =
 VARIABLE_VALUE
 1
 '#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@session.storage_engine =
+SELECT @@session.default_storage_engine =
 VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='storage_engine';
-@@session.storage_engine =
+WHERE VARIABLE_NAME='default_storage_engine';
+@@session.default_storage_engine =
 VARIABLE_VALUE
 1
 '#------------------FN_DYNVARS_005_07-----------------------#'
-SET @@global.storage_engine = TRUE;
-ERROR 42000: Incorrect argument type to variable 'storage_engine'
-SET @@global.storage_engine = FALSE;
-ERROR 42000: Incorrect argument type to variable 'storage_engine'
+SET @@global.default_storage_engine = TRUE;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = FALSE;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
 '#---------------------FN_DYNVARS_001_8----------------------#'
-SET @@storage_engine = MYISAM;
-SELECT @@storage_engine = @@local.storage_engine;
-@@storage_engine = @@local.storage_engine
+SET @@default_storage_engine = MYISAM;
+SELECT @@default_storage_engine = @@local.default_storage_engine;
+@@default_storage_engine = @@local.default_storage_engine
 1
-SELECT @@local.storage_engine = @@session.storage_engine;
-@@local.storage_engine = @@session.storage_engine
+SELECT @@local.default_storage_engine = @@session.default_storage_engine;
+@@local.default_storage_engine = @@session.default_storage_engine
 1
 '#---------------------FN_DYNVARS_001_9----------------------#'
-SET storage_engine = MEMORY;
-SELECT @@storage_engine;
-@@storage_engine
+SET default_storage_engine = MEMORY;
+SELECT @@default_storage_engine;
+@@default_storage_engine
 MEMORY
-SELECT local.storage_engine;
+SELECT local.default_storage_engine;
 ERROR 42S02: Unknown table 'local' in field list
-SELECT session.storage_engine;
+SELECT session.default_storage_engine;
 ERROR 42S02: Unknown table 'session' in field list
-SELECT storage_engine = @@session.storage_engine;
-ERROR 42S22: Unknown column 'storage_engine' in 'field list'
-SET @@storage_engine = @start_global_value;
-SET @@global.storage_engine = @start_global_value;
-SELECT @@global.storage_engine;
-@@global.storage_engine
-InnoDB
-SET @@session.storage_engine = @start_session_value;
-SELECT @@session.storage_engine;
-@@session.storage_engine
+SELECT default_storage_engine = @@session.default_storage_engine;
+ERROR 42S22: Unknown column 'default_storage_engine' in 'field list'
+SET @@default_storage_engine = @start_global_value;
+SET @@global.default_storage_engine = @start_global_value;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+InnoDB
+SET @@session.default_storage_engine = @start_session_value;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
 InnoDB

=== modified file 'mysql-test/suite/sys_vars/t/storage_engine_basic.test'
--- a/mysql-test/suite/sys_vars/t/storage_engine_basic.test	2010-06-17 20:51:35 +0000
+++ b/mysql-test/suite/sys_vars/t/storage_engine_basic.test	2010-10-25 09:20:53 +0000
@@ -34,9 +34,9 @@
 #                 Save initial value                        #
 #############################################################
 
-SET @start_global_value = @@global.storage_engine;
+SET @start_global_value = @@global.default_storage_engine;
 SELECT @start_global_value;
-SET @start_session_value = @@session.storage_engine;
+SET @start_session_value = @@session.default_storage_engine;
 SELECT @start_session_value;
 
 
@@ -45,13 +45,13 @@ SELECT @start_session_value;
 #     Display the DEFAULT value of storage_engine                    #
 ######################################################################
 
-SET @@global.storage_engine = INNODB;
-SET @@global.storage_engine = DEFAULT;
-SELECT @@global.storage_engine;
-
-SET @@session.storage_engine = INNODB;
-SET @@session.storage_engine = DEFAULT;
-SELECT @@session.storage_engine;
+SET @@global.default_storage_engine = INNODB;
+SET @@global.default_storage_engine = DEFAULT;
+SELECT @@global.default_storage_engine;
+
+SET @@session.default_storage_engine = INNODB;
+SET @@session.default_storage_engine = DEFAULT;
+SELECT @@session.default_storage_engine;
 
 
 --echo '#--------------------FN_DYNVARS_005_02-------------------------#'
@@ -59,14 +59,14 @@ SELECT @@session.storage_engine;
 # Change the value of storage_engine to a valid value for GLOBAL Scope #
 ########################################################################
 
-SET @@global.storage_engine = MYISAM;
-SELECT @@global.storage_engine;
-SET @@global.storage_engine = MERGE;
-SELECT @@global.storage_engine;
-SET @@global.storage_engine = MEMORY;
-SELECT @@global.storage_engine;
-SET @@global.storage_engine = INNODB;
-SELECT @@global.storage_engine;
+SET @@global.default_storage_engine = MYISAM;
+SELECT @@global.default_storage_engine;
+SET @@global.default_storage_engine = MERGE;
+SELECT @@global.default_storage_engine;
+SET @@global.default_storage_engine = MEMORY;
+SELECT @@global.default_storage_engine;
+SET @@global.default_storage_engine = INNODB;
+SELECT @@global.default_storage_engine;
 
 
 --echo '#--------------------FN_DYNVARS_005_03-------------------------#'
@@ -74,14 +74,14 @@ SELECT @@global.storage_engine;
 # Change the value of storage_engine to a valid value for SESSION Scope #
 #########################################################################
  
-SET @@session.storage_engine = MYISAM;
-SELECT @@session.storage_engine;
-SET @@session.storage_engine = MERGE;
-SELECT @@session.storage_engine;
-SET @@session.storage_engine = MEMORY;
-SELECT @@session.storage_engine;
-SET @@session.storage_engine = INNODB;
-SELECT @@session.storage_engine;
+SET @@session.default_storage_engine = MYISAM;
+SELECT @@session.default_storage_engine;
+SET @@session.default_storage_engine = MERGE;
+SELECT @@session.default_storage_engine;
+SET @@session.default_storage_engine = MEMORY;
+SELECT @@session.default_storage_engine;
+SET @@session.default_storage_engine = INNODB;
+SELECT @@session.default_storage_engine;
 
 
 --echo '#------------------FN_DYNVARS_005_04-----------------------#'
@@ -90,28 +90,28 @@ SELECT @@session.storage_engine;
 ##################################################################
 
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.storage_engine = 8199;
+SET @@global.default_storage_engine = 8199;
 
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.storage_engine = NULL;
+SET @@global.default_storage_engine = NULL;
 
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.storage_engine = -1024;
+SET @@global.default_storage_engine = -1024;
 
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.storage_engine = 65530.34;
+SET @@global.default_storage_engine = 65530.34;
 
 --Error ER_UNKNOWN_STORAGE_ENGINE
-SET @@global.storage_engine = FILE;
+SET @@global.default_storage_engine = FILE;
 
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.storage_engine = 8199;
+SET @@session.default_storage_engine = 8199;
 
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.storage_engine = 65530.34;
+SET @@session.default_storage_engine = 65530.34;
 
 --Error ER_UNKNOWN_STORAGE_ENGINE
-SET @@session.storage_engine = RECORD;
+SET @@session.default_storage_engine = RECORD;
 
 
 --echo '#------------------FN_DYNVARS_005_05-----------------------#'
@@ -120,18 +120,18 @@ SET @@session.storage_engine = RECORD;
 ####################################################################
 
 
-SELECT @@global.storage_engine =
+SELECT @@global.default_storage_engine =
  VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-  WHERE VARIABLE_NAME='storage_engine';
+  WHERE VARIABLE_NAME='default_storage_engine';
 
 --echo '#------------------FN_DYNVARS_005_06-----------------------#'
 ####################################################################
 #  Check if the value in SESSION Table matches value in variable   #
 ####################################################################
 
-SELECT @@session.storage_engine =
+SELECT @@session.default_storage_engine =
  VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-  WHERE VARIABLE_NAME='storage_engine';
+  WHERE VARIABLE_NAME='default_storage_engine';
 
 
 --echo '#------------------FN_DYNVARS_005_07-----------------------#'
@@ -140,10 +140,10 @@ SELECT @@session.storage_engine =
 ####################################################################
 
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.storage_engine = TRUE;
+SET @@global.default_storage_engine = TRUE;
 
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.storage_engine = FALSE;
+SET @@global.default_storage_engine = FALSE;
 
 
 --echo '#---------------------FN_DYNVARS_001_8----------------------#'
@@ -152,9 +152,9 @@ SET @@global.storage_engine = FALSE;
 #  SCOPE points to same session variable                      #
 ###############################################################
 
-SET @@storage_engine = MYISAM;
-SELECT @@storage_engine = @@local.storage_engine;
-SELECT @@local.storage_engine = @@session.storage_engine;
+SET @@default_storage_engine = MYISAM;
+SELECT @@default_storage_engine = @@local.default_storage_engine;
+SELECT @@local.default_storage_engine = @@session.default_storage_engine;
 
 
 --echo '#---------------------FN_DYNVARS_001_9----------------------#'
@@ -162,26 +162,26 @@ SELECT @@local.storage_engine = @@sessio
 #   Check if storage_engine can be accessed with and without @@ sign    #
 #########################################################################
 
-SET storage_engine = MEMORY;
-SELECT @@storage_engine;
+SET default_storage_engine = MEMORY;
+SELECT @@default_storage_engine;
 --Error ER_UNKNOWN_TABLE
-SELECT local.storage_engine;
+SELECT local.default_storage_engine;
 --Error ER_UNKNOWN_TABLE
-SELECT session.storage_engine;
+SELECT session.default_storage_engine;
 --Error ER_BAD_FIELD_ERROR
-SELECT storage_engine = @@session.storage_engine;
+SELECT default_storage_engine = @@session.default_storage_engine;
 
 # check the old obsolete name
-SET @@storage_engine = @start_global_value;
+SET @@default_storage_engine = @start_global_value;
 
 ####################################
 #     Restore initial value        #
 ####################################
 
-SET @@global.storage_engine = @start_global_value;
-SELECT @@global.storage_engine;
-SET @@session.storage_engine = @start_session_value;
-SELECT @@session.storage_engine;
+SET @@global.default_storage_engine = @start_global_value;
+SELECT @@global.default_storage_engine;
+SET @@session.default_storage_engine = @start_session_value;
+SELECT @@session.default_storage_engine;
 
 
 #############################################################

=== modified file 'mysql-test/t/archive.test'
--- a/mysql-test/t/archive.test	2010-07-29 09:55:07 +0000
+++ b/mysql-test/t/archive.test	2010-10-25 09:20:53 +0000
@@ -11,7 +11,7 @@ CALL mtr.add_suppression("Unsafe stateme
 DROP TABLE if exists t1,t2,t3,t4,t5,t6;
 --enable_warnings
 
-SET storage_engine=ARCHIVE;
+SET default_storage_engine=ARCHIVE;
 
 CREATE TABLE t1 (
   Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,

=== modified file 'mysql-test/t/archive_gis.test'
--- a/mysql-test/t/archive_gis.test	2005-10-27 19:45:18 +0000
+++ b/mysql-test/t/archive_gis.test	2010-10-25 09:20:53 +0000
@@ -1,3 +1,3 @@
 --source include/have_archive.inc
-SET storage_engine=archive;
+SET default_storage_engine=archive;
 --source include/gis_generic.inc

=== modified file 'mysql-test/t/create.test'
--- a/mysql-test/t/create.test	2010-08-18 09:35:41 +0000
+++ b/mysql-test/t/create.test	2010-10-25 09:20:53 +0000
@@ -193,17 +193,17 @@ drop table if exists t1;
 #
 # Test default table type
 #
-SET SESSION storage_engine="heap";
-SELECT @@storage_engine;
+SET SESSION default_storage_engine="heap";
+SELECT @@default_storage_engine;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
 --error 1286
-SET SESSION storage_engine="gemini";
-SELECT @@storage_engine;
+SET SESSION default_storage_engine="gemini";
+SELECT @@default_storage_engine;
 CREATE TABLE t1 (a int not null);
 show create table t1;
-SET SESSION storage_engine=default;
+SET SESSION default_storage_engine=default;
 drop table t1;
 
 
@@ -351,17 +351,17 @@ drop tables t1, t2;
 #
 # Test default table type
 #
-SET SESSION storage_engine="heap";
-SELECT @@storage_engine;
+SET SESSION default_storage_engine="heap";
+SELECT @@default_storage_engine;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
 --error 1286
-SET SESSION storage_engine="gemini";
-SELECT @@storage_engine;
+SET SESSION default_storage_engine="gemini";
+SELECT @@default_storage_engine;
 CREATE TABLE t1 (a int not null);
 show create table t1;
-SET SESSION storage_engine=default;
+SET SESSION default_storage_engine=default;
 drop table t1;
 
 #

=== modified file 'mysql-test/t/group_by.test'
--- a/mysql-test/t/group_by.test	2010-07-30 13:56:57 +0000
+++ b/mysql-test/t/group_by.test	2010-10-25 09:20:53 +0000
@@ -288,14 +288,14 @@ SELECT a,count(*) FROM t1 GROUP BY binar
 SELECT binary a FROM t1 GROUP BY 1;
 SELECT binary a,count(*) FROM t1 GROUP BY 1;
 # Do the same tests with MyISAM temporary tables
-SET SQL_BIG_TABLES=1;
+SET BIG_TABLES=1;
 SELECT a FROM t1 GROUP BY a;
 SELECT a,count(*) FROM t1 GROUP BY a;
 SELECT a FROM t1 GROUP BY binary a;
 SELECT a,count(*) FROM t1 GROUP BY binary a;
 SELECT binary a FROM t1 GROUP BY 1;
 SELECT binary a,count(*) FROM t1 GROUP BY 1;
-SET SQL_BIG_TABLES=0;
+SET BIG_TABLES=0;
 drop table t1;
 
 #
@@ -389,7 +389,7 @@ drop table t1,t2,t3;
 create table t1 (a blob null);
 insert into t1 values (NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(""),(""),(""),("b");
 select a,count(*) from t1 group by a;
-set option sql_big_tables=1;
+set option big_tables=1;
 select a,count(*) from t1 group by a;
 drop table t1;
 

=== modified file 'mysql-test/t/heap.test'
--- a/mysql-test/t/heap.test	2007-06-06 17:57:07 +0000
+++ b/mysql-test/t/heap.test	2010-10-25 09:20:53 +0000
@@ -201,8 +201,8 @@ drop table t1;
 # We can't use varchar.inc becasue heap doesn't support blob's
 #
 
-let $default=`select @@storage_engine`;
-set storage_engine=HEAP;
+let $default=`select @@default_storage_engine`;
+set default_storage_engine=HEAP;
 
 #
 # Simple basic test that endspace is saved
@@ -405,7 +405,7 @@ drop table t1;
 #
 # Reset varchar test
 #
-eval set storage_engine=$default;
+eval set default_storage_engine=$default;
 
 #
 # Bug #8489: Strange auto_increment behaviour

=== modified file 'mysql-test/t/innodb_icp_none.test'
--- a/mysql-test/t/innodb_icp_none.test	2010-06-18 08:45:53 +0000
+++ b/mysql-test/t/innodb_icp_none.test	2010-10-25 09:20:53 +0000
@@ -25,10 +25,10 @@ if (`select locate('mrr', @@optimizer_sw
 --enable_query_log
 
 
-set @save_storage_engine= @@storage_engine;
-set storage_engine=InnoDB;
+set @save_storage_engine= @@default_storage_engine;
+set default_storage_engine=InnoDB;
 
 --source include/icp_tests.inc
 
-set storage_engine= @save_storage_engine;
+set default_storage_engine= @save_storage_engine;
 set optimizer_switch=default;

=== modified file 'mysql-test/t/innodb_mrr_none.test'
--- a/mysql-test/t/innodb_mrr_none.test	2010-06-18 08:45:53 +0000
+++ b/mysql-test/t/innodb_mrr_none.test	2010-10-25 09:20:53 +0000
@@ -24,12 +24,12 @@ if (`select locate('mrr', @@optimizer_sw
 }
 --enable_query_log
 
-set @save_storage_engine= @@storage_engine;
-set storage_engine=InnoDB;
+set @save_storage_engine= @@default_storage_engine;
+set default_storage_engine=InnoDB;
 
 --source include/mrr_tests.inc 
 --source include/mrr_innodb_tests.inc
 
-set storage_engine= @save_storage_engine;
+set default_storage_engine= @save_storage_engine;
 set optimizer_switch=default;
 

=== modified file 'mysql-test/t/log_tables.test'
--- a/mysql-test/t/log_tables.test	2009-11-24 11:08:04 +0000
+++ b/mysql-test/t/log_tables.test	2010-10-25 09:20:53 +0000
@@ -256,8 +256,8 @@ set global general_log='OFF';
 set global slow_query_log='OFF';
 
 # check that alter table doesn't work for other engines
-set @save_storage_engine= @@session.storage_engine;
-set storage_engine= MEMORY;
+set @save_storage_engine= @@session.default_storage_engine;
+set default_storage_engine= MEMORY;
 # After fixing bug#35765 the error behaivor changed:
 # If compiled in/enabled ER_UNSUPORTED_LOG_ENGINE
 # If not (i.e. not existant) it will show a warning
@@ -273,7 +273,7 @@ alter table mysql.slow_log engine=memory
 #alter table mysql.slow_log engine=archive;
 #--error ER_UNSUPORTED_LOG_ENGINE
 #alter table mysql.slow_log engine=blackhole;
-set storage_engine= @save_storage_engine;
+set default_storage_engine= @save_storage_engine;
 
 drop table mysql.slow_log;
 drop table mysql.general_log;

=== modified file 'mysql-test/t/merge.test'
--- a/mysql-test/t/merge.test	2010-09-21 14:47:41 +0000
+++ b/mysql-test/t/merge.test	2010-10-25 09:20:53 +0000
@@ -3,9 +3,9 @@
 #
 
 # MERGE tables require MyISAM tables
-let $default=`select @@global.storage_engine`;
-set global storage_engine=myisam;
-set session storage_engine=myisam;
+let $default=`select @@global.default_storage_engine`;
+set global default_storage_engine=myisam;
+set session default_storage_engine=myisam;
 
 # Clean up resources used in this test case.
 --disable_warnings
@@ -2669,6 +2669,6 @@ drop table t1, t2, t3, m1, m2;
 
 --disable_result_log
 --disable_query_log
-eval set global storage_engine=$default;
+eval set global default_storage_engine=$default;
 --enable_result_log
 --enable_query_log

=== modified file 'mysql-test/t/merge_mmap.test'
--- a/mysql-test/t/merge_mmap.test	2010-07-02 16:07:57 +0000
+++ b/mysql-test/t/merge_mmap.test	2010-10-25 09:20:53 +0000
@@ -3,9 +3,9 @@
 #
 
 # MERGE tables require MyISAM tables
---let $default=`SELECT @@global.storage_engine`
-SET GLOBAL storage_engine = MyISAM;
-SET SESSION storage_engine = MyISAM;
+--let $default=`SELECT @@global.default_storage_engine`
+SET GLOBAL default_storage_engine = MyISAM;
+SET SESSION default_storage_engine = MyISAM;
 
 # Clean up resources used in this test case.
 --disable_warnings

=== modified file 'mysql-test/t/mysqldump-max.test'
--- a/mysql-test/t/mysqldump-max.test	2008-09-19 13:24:32 +0000
+++ b/mysql-test/t/mysqldump-max.test	2010-10-25 09:20:53 +0000
@@ -76,8 +76,8 @@ drop table t6;
 # type to avoid Inno's column-number limits (~1000 columns) etc.
 # Here because it needs Inno-engine.
 
-SELECT @@global.storage_engine INTO @old_engine;
-SET GLOBAL storage_engine=InnoDB;
+SELECT @@global.default_storage_engine INTO @old_engine;
+SET GLOBAL default_storage_engine=InnoDB;
 
 --disable_query_log
 CREATE TABLE `t1` (
@@ -1123,4 +1123,4 @@ SELECT COUNT(*) FROM v1;
 DROP VIEW  v1;
 DROP TABLE t1;
 
-SET GLOBAL storage_engine=@old_engine;
+SET GLOBAL default_storage_engine=@old_engine;

=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test	2010-09-27 13:20:24 +0000
+++ b/mysql-test/t/partition.test	2010-10-25 09:20:53 +0000
@@ -870,13 +870,13 @@ drop table t1;
 #
 # Bug #16775: Wrong engine type stored for subpartition
 #
-set session storage_engine= 'memory';
+set session default_storage_engine= 'memory';
 create table t1 (f_int1 int(11) default null) engine = memory
   partition by range (f_int1) subpartition by hash (f_int1)
   (partition part1 values less than (1000)
    (subpartition subpart11 engine = memory));
 drop table t1;
-set session storage_engine='myisam';
+set session default_storage_engine='myisam';
 
 #
 # Bug #16782: Crash using REPLACE on table with primary key

=== modified file 'mysql-test/t/type_blob.test'
--- a/mysql-test/t/type_blob.test	2009-12-02 15:50:14 +0000
+++ b/mysql-test/t/type_blob.test	2010-10-25 09:20:53 +0000
@@ -112,7 +112,7 @@ select distinct t from t1 order by t;
 select distinct b from t1 order by b;
 select t from t1 group by t;
 select b from t1 group by b;
-set option sql_big_tables=1;
+set option big_tables=1;
 select distinct t from t1;
 select distinct b from t1;
 select distinct t from t1 order by t;
@@ -123,7 +123,7 @@ select distinct c from t1 order by c;
 select distinct d from t1 order by d;
 select c from t1 group by c;
 select d from t1 group by d;
-set option sql_big_tables=0;
+set option big_tables=0;
 select distinct * from t1;
 select t,count(*) from t1 group by t;
 select b,count(*) from t1 group by b;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-10-22 06:47:00 +0000
+++ b/sql/mysqld.cc	2010-10-25 09:20:53 +0000
@@ -6003,8 +6003,9 @@ struct my_option my_long_options[]=
    "the I/O replication thread is in the master's binlogs.",
    &master_info_file, &master_info_file, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"master-retry-count", 0,
-   "The number of tries the slave will make to connect to the master before giving up.",
+  {"master-retry-count", OPT_MASTER_RETRY_COUNT,
+   "The number of tries the slave will make to connect to the master before giving up. "
+   "Deprecated option, use 'CHANGE MASTER TO master_retry_count = <num>' instead.", 
    &master_retry_count, &master_retry_count, 0, GET_ULONG,
    REQUIRED_ARG, 3600*24, 0, 0, 0, 0, 0},
 #ifdef HAVE_REPLICATION
@@ -7048,7 +7049,7 @@ mysqld_get_one_option(int optid,
       default_collation_name= 0;
     break;
   case 'l':
-    WARN_DEPRECATED(NULL, 7, 0, "--log", "'--general-log'/'--general-log-file'");
+    WARN_DEPRECATED(NULL, "--log", "'--general-log'/'--general-log-file'");
     opt_log=1;
     break;
   case 'h':
@@ -7063,6 +7064,9 @@ mysqld_get_one_option(int optid,
       sql_print_warning("Ignoring user change to '%s' because the user was set to '%s' earlier on the command line\n", argument, mysqld_user);
     break;
   case 'L':
+    WARN_DEPRECATED(NULL, "--language/-l", "'--lc-messages-dir'");
+    /* Note:  fall-through */
+  case OPT_LC_MESSAGES_DIRECTORY:
     strmake(lc_messages_dir, argument, sizeof(lc_messages_dir)-1);
     lc_messages_dir_ptr= lc_messages_dir;
     break;
@@ -7183,9 +7187,12 @@ mysqld_get_one_option(int optid,
   }
 #endif /* HAVE_REPLICATION */
   case (int) OPT_SLOW_QUERY_LOG:
-    WARN_DEPRECATED(NULL, 7, 0, "--log-slow-queries", "'--slow-query-log'/'--slow-query-log-file'");
+    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;
   case (int) OPT_SKIP_NEW:
     opt_specialflag|= SPECIAL_NO_NEW_FUNC;
     delay_key_write_options= DELAY_KEY_WRITE_NONE;

=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h	2010-09-01 13:06:14 +0000
+++ b/sql/mysqld.h	2010-10-25 09:20:53 +0000
@@ -367,7 +367,9 @@ enum options_mysqld
   OPT_KEY_CACHE_AGE_THRESHOLD,
   OPT_KEY_CACHE_BLOCK_SIZE,
   OPT_KEY_CACHE_DIVISION_LIMIT,
+  OPT_LC_MESSAGES_DIRECTORY,
   OPT_LOWER_CASE_TABLE_NAMES,
+  OPT_MASTER_RETRY_COUNT,
   OPT_ONE_THREAD,
   OPT_POOL_OF_THREADS,
   OPT_REPLICATE_DO_DB,

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2010-10-08 14:35:24 +0000
+++ b/sql/set_var.cc	2010-10-25 09:20:53 +0000
@@ -133,7 +133,6 @@ void sys_var_end()
                    put your additional checks here
   @param on_update_func a function to be called at the end of sys_var::update,
                    any post-update activity should happen here
-  @param deprecated_version if not 0 - when this variable will go away
   @param substitute if not 0 - what one should use instead when this
                    deprecated variable
   @param parse_flag either PARSE_EARLY or PARSE_NORMAL
@@ -145,8 +144,7 @@ sys_var::sys_var(sys_var_chain *chain, c
                  PolyLock *lock, enum binlog_status_enum binlog_status_arg,
                  on_check_function on_check_func,
                  on_update_function on_update_func,
-                 uint deprecated_version, const char *substitute,
-                 int parse_flag) :
+                 const char *substitute, int parse_flag) :
   next(0),
   binlog_status(binlog_status_arg),
   flags(flags_arg), m_parse_flag(parse_flag), show_val_type(show_val_type_arg),
@@ -176,11 +174,7 @@ sys_var::sys_var(sys_var_chain *chain, c
   option.value= (uchar **)global_var_ptr();
   option.def_value= def_val;
 
-  deprecated.version= deprecated_version;
-  deprecated.substitute= substitute;
-  DBUG_ASSERT((deprecated_version != 0) || (substitute == 0));
-  DBUG_ASSERT(deprecated_version % 100 == 0);
-  DBUG_ASSERT(!deprecated_version || MYSQL_VERSION_ID < deprecated_version);
+  deprecation_substitute= substitute;
 
   if (chain->last)
     chain->last->next= this;
@@ -276,21 +270,25 @@ bool sys_var::set_default(THD *thd, enum
 
 void sys_var::do_deprecated_warning(THD *thd)
 {
-  if (deprecated.version)
+  if (deprecation_substitute)
   {
-    char buf1[NAME_CHAR_LEN + 3], buf2[10];
+    char buf1[NAME_CHAR_LEN + 3];
     strxnmov(buf1, sizeof(buf1)-1, "@@", name.str, 0);
-    my_snprintf(buf2, sizeof(buf2), "%d.%d", deprecated.version/100/100,
-                deprecated.version/100%100);
-    uint errmsg= deprecated.substitute
-                        ? ER_WARN_DEPRECATED_SYNTAX_WITH_VER
+
+    /* 
+       if deprecation_substitute is an empty string,
+       there is no replacement for the syntax
+    */
+    uint errmsg= deprecation_substitute[0]
+                        ? ER_WARN_DEPRECATED_SYNTAX
                         : ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT;
     if (thd)
       push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                           ER_WARN_DEPRECATED_SYNTAX, ER(errmsg),
-                          buf1, buf2, deprecated.substitute);
+                          buf1, deprecation_substitute);
     else
-      sql_print_warning(ER_DEFAULT(errmsg), buf1, buf2, deprecated.substitute);
+      sql_print_warning(ER_DEFAULT(errmsg), buf1, 
+                        deprecation_substitute);
   }
 }
 

=== modified file 'sql/set_var.h'
--- a/sql/set_var.h	2010-10-03 23:42:39 +0000
+++ b/sql/set_var.h	2010-10-25 09:20:53 +0000
@@ -81,7 +81,7 @@ protected:
   ptrdiff_t offset;     ///< offset to the value from global_system_variables
   on_check_function on_check;
   on_update_function on_update;
-  struct { uint version; const char *substitute; } deprecated;
+  const char *deprecation_substitute;
   bool is_os_charset; ///< true if the value is in character_set_filesystem
 
 public:
@@ -90,7 +90,7 @@ public:
           enum get_opt_arg_type getopt_arg_type, SHOW_TYPE show_val_type_arg,
           longlong def_val, PolyLock *lock, enum binlog_status_enum binlog_status_arg,
           on_check_function on_check_func, on_update_function on_update_func,
-          uint deprecated_version, const char *substitute, int parse_flag);
+          const char *substitute, int parse_flag);
 
   virtual ~sys_var() {}
 

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2010-09-21 21:27:43 +0000
+++ b/sql/sql_plugin.cc	2010-10-25 09:20:53 +0000
@@ -219,7 +219,7 @@ public:
              (plugin_var_arg->flags & PLUGIN_VAR_THDLOCAL ? SESSION : GLOBAL) |
              (plugin_var_arg->flags & PLUGIN_VAR_READONLY ? READONLY : 0),
              0, -1, NO_ARG, pluginvar_show_type(plugin_var_arg), 0, 0,
-             VARIABLE_NOT_IN_BINLOG, 0, 0, 0, 0, PARSE_NORMAL),
+             VARIABLE_NOT_IN_BINLOG, 0, 0, 0, PARSE_NORMAL),
     plugin_var(plugin_var_arg), orig_pluginvar_name(plugin_var_arg->name)
   { plugin_var->name= name_arg; }
   sys_var_pluginvar *cast_pluginvar() { return this; }

=== modified file 'sql/sql_priv.h'
--- a/sql/sql_priv.h	2010-10-22 13:33:24 +0000
+++ b/sql/sql_priv.h	2010-10-25 09:20:53 +0000
@@ -29,25 +29,21 @@
 #ifndef MYSQL_CLIENT
 
 /*
-  Generates a warning that a feature is deprecated. After a specified
-  version asserts that the feature is removed.
+  Generates a warning that a feature is deprecated. 
 
   Using it as
 
-  WARN_DEPRECATED(thd, 6,2, "BAD", "'GOOD'");
+  WARN_DEPRECATED(thd, "BAD", "'GOOD'");
 
   Will result in a warning
  
-  "The syntax 'BAD' is deprecated and will be removed in MySQL 6.2. Please
-   use 'GOOD' instead"
+  "The syntax 'BAD' is deprecated and will be removed in a
+   future release. Please use 'GOOD' instead"
 
    Note that in macro arguments BAD is not quoted, while 'GOOD' is.
-   Note that the version is TWO numbers, separated with a comma
-   (two macro arguments, that is)
 */
-#define WARN_DEPRECATED(Thd,VerHi,VerLo,Old,New)                            \
+#define WARN_DEPRECATED(Thd,Old,New)                            \
   do {                                                                      \
-    compile_time_assert(MYSQL_VERSION_ID < VerHi * 10000 + VerLo * 100);    \
     if (((THD *) Thd) != NULL)                                              \
       push_warning_printf(((THD *) Thd), MYSQL_ERROR::WARN_LEVEL_WARN,      \
                         ER_WARN_DEPRECATED_SYNTAX,                          \

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-10-08 16:11:32 +0000
+++ b/sql/sys_vars.cc	2010-10-25 09:20:53 +0000
@@ -69,7 +69,7 @@ extern void close_thread_tables(THD *thd
 
 #define PFS_TRAILING_PROPERTIES \
   NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), ON_UPDATE(NULL), \
-  0, NULL, sys_var::PARSE_EARLY
+  NULL, sys_var::PARSE_EARLY
 
 static Sys_var_mybool Sys_pfs_enabled(
        "performance_schema",
@@ -955,7 +955,8 @@ static Sys_var_mybool Sys_large_pages(
 
 static Sys_var_charptr Sys_language(
        "lc_messages_dir", "Directory where error messages are",
-       READ_ONLY GLOBAL_VAR(lc_messages_dir_ptr), CMD_LINE(REQUIRED_ARG, 'L'),
+       READ_ONLY GLOBAL_VAR(lc_messages_dir_ptr), 
+       CMD_LINE(REQUIRED_ARG, OPT_LC_MESSAGES_DIRECTORY),
        IN_FS_CHARSET, DEFAULT(0));
 
 static Sys_var_mybool Sys_local_infile(
@@ -1053,14 +1054,13 @@ 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));
 
-#ifndef TO_BE_DELETED   /* Alias for the low_priority_updates */
 static Sys_var_mybool Sys_sql_low_priority_updates(
        "sql_low_priority_updates",
        "INSERT/DELETE/UPDATE has lower priority than selects",
        SESSION_VAR(low_priority_updates), NO_CMD_LINE,
        DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-       ON_UPDATE(fix_low_prio_updates));
-#endif
+       ON_UPDATE(fix_low_prio_updates), 
+       DEPRECATED("@@low_priority_updates"));
 
 static Sys_var_mybool Sys_lower_case_file_system(
        "lower_case_file_system",
@@ -1237,7 +1237,7 @@ static Sys_var_harows Sys_sql_max_join_s
        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(70000, 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(
@@ -1685,9 +1685,13 @@ static Sys_var_charptr Sys_socket(
 static Sys_var_ulong Sys_thread_concurrency(
        "thread_concurrency",
        "Permits the application to give the threads system a hint for "
-       "the desired number of threads that should be run at the same time",
+       "the desired number of threads that should be run at the same time. "
+       "This variable has no effect, and is deprecated. "
+       "It will be removed in a future release. ",
        READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1));
+       VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), 
+       DEPRECATED(""));
 
 static Sys_var_ulong Sys_thread_stack(
        "thread_stack", "The stack size for each thread",
@@ -2195,7 +2199,7 @@ static Sys_var_mybool Sys_engine_conditi
        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(70000, "'@@optimizer_switch'"));
+       DEPRECATED("'@@optimizer_switch'"));
 
 static Sys_var_plugin Sys_default_storage_engine(
        "default_storage_engine", "The default storage engine for new tables",
@@ -2208,7 +2212,8 @@ static Sys_var_plugin Sys_storage_engine
        "storage_engine", "Alias for @@default_storage_engine. Deprecated",
        SESSION_VAR(table_plugin), NO_CMD_LINE,
        MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_storage_engine),
-       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null));
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null),
+       ON_UPDATE(NULL), DEPRECATED("'@@default_storage_engine'"));
 
 #if defined(ENABLED_DEBUG_SYNC)
 /*
@@ -2316,11 +2321,11 @@ static Sys_var_mybool Sys_big_tables(
        "temporary sets on file (Solves most 'table full' errors)",
        SESSION_VAR(big_tables), CMD_LINE(OPT_ARG), DEFAULT(FALSE));
 
-#ifndef TO_BE_DELETED   /* Alias for big_tables */
 static Sys_var_mybool Sys_sql_big_tables(
        "sql_big_tables", "alias for big_tables",
-       SESSION_VAR(big_tables), NO_CMD_LINE, DEFAULT(FALSE));
-#endif
+       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",
@@ -2870,7 +2875,7 @@ 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(70000, "'@@general_log'"));
+       ON_UPDATE(fix_log_state), DEPRECATED("'@@general_log'"));
 
 static Sys_var_mybool Sys_slow_query_log(
        "slow_query_log",
@@ -2887,7 +2892,7 @@ static Sys_var_mybool Sys_log_slow(
        "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(70000, "'@@slow_query_log'"));
+       ON_UPDATE(fix_log_state), DEPRECATED("'@@slow_query_log'"));
 
 static bool fix_log_state(sys_var *self, THD *thd, enum_var_type type)
 {

=== modified file 'sql/sys_vars.h'
--- a/sql/sys_vars.h	2010-09-08 07:09:13 +0000
+++ b/sql/sys_vars.h	2010-10-25 09:20:53 +0000
@@ -58,7 +58,7 @@
   @@foreign_key_checks <-> OPTION_NO_FOREIGN_KEY_CHECKS
 */
 #define REVERSE(X) ~(X)
-#define DEPRECATED(X, Y) X, Y
+#define DEPRECATED(X) X
 
 #define session_var(THD, TYPE) (*(TYPE*)session_var_ptr(THD))
 #define global_var(TYPE) (*(TYPE*)global_var_ptr())
@@ -109,11 +109,11 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0,
+          const char *substitute=0,
           int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, SHOWT, def_val, lock, binlog_status_arg,
-              on_check_func, on_update_func, deprecated_version,
+              on_check_func, on_update_func,
               substitute, parse_flag)
   {
     option.var_type= ARGT;
@@ -197,11 +197,11 @@ public:
           ulonglong def_val, PolyLock *lock,
           enum binlog_status_enum binlog_status_arg,
           on_check_function on_check_func, on_update_function on_update_func,
-          uint deprecated_version, const char *substitute, int parse_flag= PARSE_NORMAL)
+          const char *substitute, int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, show_val_type_arg, def_val, lock,
               binlog_status_arg, on_check_func,
-              on_update_func, deprecated_version, substitute, parse_flag)
+              on_update_func, substitute, parse_flag)
   {
     for (typelib.count= 0; values[typelib.count]; typelib.count++) /*no-op */;
     typelib.name="";
@@ -264,11 +264,11 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0)
+          const char *substitute=0)
     : Sys_var_typelib(name_arg, comment, flag_args, off, getopt,
                       SHOW_CHAR, values, def_val, lock,
                       binlog_status_arg, on_check_func, on_update_func,
-                      deprecated_version, substitute)
+                      substitute)
   {
     option.var_type= GET_ENUM;
     global_var(ulong)= def_val;
@@ -311,12 +311,12 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0,
+          const char *substitute=0,
           int parse_flag= PARSE_NORMAL)
     : Sys_var_typelib(name_arg, comment, flag_args, off, getopt,
                       SHOW_MY_BOOL, bool_values, def_val, lock,
                       binlog_status_arg, on_check_func, on_update_func,
-                      deprecated_version, substitute, parse_flag)
+                      substitute, parse_flag)
   {
     option.var_type= GET_BOOL;
     global_var(my_bool)= def_val;
@@ -367,12 +367,12 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0,
+          const char *substitute=0,
           int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, SHOW_CHAR_PTR, (intptr)def_val,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag)
+              substitute, parse_flag)
   {
     is_os_charset= is_os_charset_arg == IN_FS_CHARSET;
     /*
@@ -475,10 +475,10 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0)
+          const char *substitute=0)
     : Sys_var_charptr(name_arg, comment, flag_args, off, sizeof(char*),
               getopt, is_os_charset_arg, def_val, lock, binlog_status_arg,
-              on_check_func, on_update_func, deprecated_version, substitute)
+              on_check_func, on_update_func, substitute)
   {
     global_var(LEX_STRING).length= strlen(def_val);
     DBUG_ASSERT(size == sizeof(LEX_STRING));
@@ -515,12 +515,12 @@ public:
                enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
                on_check_function on_check_func=0,
                on_update_function on_update_func=0,
-               uint deprecated_version=0, const char *substitute=0,
+               const char *substitute=0,
                int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, 0, getopt.id,
               getopt.arg_type, SHOW_CHAR, (intptr)def_val,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag)
+              substitute, parse_flag)
   { option.var_type= GET_NO_ARG; }
   bool do_check(THD *thd, set_var *var)
   {
@@ -600,11 +600,11 @@ public:
           enum binlog_status_enum binlog_status_arg,
           on_check_function on_check_func,
           keycache_update_function on_update_func,
-          uint deprecated_version=0, const char *substitute=0)
+          const char *substitute=0)
     : Sys_var_ulonglong(name_arg, comment, flag_args, off, size,
               getopt, min_val, max_val, def_val,
               block_size, lock, binlog_status_arg, on_check_func, 0,
-              deprecated_version, substitute),
+              substitute),
     keycache_update(on_update_func)
   {
     option.var_type|= GET_ASK_ADDR;
@@ -738,12 +738,12 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0,
+          const char *substitute=0,
           int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, SHOW_DOUBLE, (longlong) double2ulonglong(def_val),
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag)
+              substitute, parse_flag)
   {
     option.var_type= GET_DOUBLE;
     option.min_value= (longlong) double2ulonglong(min_val);
@@ -803,11 +803,11 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0)
+          const char *substitute=0)
     : Sys_var_uint(name_arg, comment, SESSION, off, size, getopt,
               min_val, max_val, def_val, block_size,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute)
+              substitute)
   { }
   uchar *session_value_ptr(THD *thd, LEX_STRING *base)
   {
@@ -844,11 +844,11 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0)
+          const char *substitute=0)
     : Sys_var_typelib(name_arg, comment, flag_args, off, getopt,
                       SHOW_CHAR, values, def_val, lock,
                       binlog_status_arg, on_check_func, on_update_func,
-                      deprecated_version, substitute)
+                      substitute)
   {
     option.var_type= GET_FLAGSET;
     global_var(ulonglong)= def_val;
@@ -955,11 +955,11 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0)
+          const char *substitute=0)
     : Sys_var_typelib(name_arg, comment, flag_args, off, getopt,
                       SHOW_CHAR, values, def_val, lock,
                       binlog_status_arg, on_check_func, on_update_func,
-                      deprecated_version, substitute)
+                      substitute)
   {
     option.var_type= GET_SET;
     global_var(ulonglong)= def_val;
@@ -1061,12 +1061,12 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0,
+          const char *substitute=0,
           int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, SHOW_CHAR, (intptr)def_val,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag),
+              substitute, parse_flag),
     plugin_type(plugin_type_arg)
   {
     option.var_type= GET_STR;
@@ -1174,12 +1174,12 @@ public:
                enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
                on_check_function on_check_func=0,
                on_update_function on_update_func=0,
-               uint deprecated_version=0, const char *substitute=0,
+               const char *substitute=0,
                int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, 0, getopt.id,
               getopt.arg_type, SHOW_CHAR, (intptr)def_val,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag)
+              substitute, parse_flag)
   {
     DBUG_ASSERT(scope() == ONLY_SESSION);
     option.var_type= GET_NO_ARG;
@@ -1267,11 +1267,11 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0)
+          const char *substitute=0)
     : Sys_var_typelib(name_arg, comment, flag_args, off, getopt,
                       SHOW_MY_BOOL, bool_values, def_val, lock,
                       binlog_status_arg, on_check_func, on_update_func,
-                      deprecated_version, substitute)
+                      substitute)
   {
     option.var_type= GET_BOOL;
     reverse_semantics= my_count_bits(bitmask_arg) > 1;
@@ -1340,11 +1340,11 @@ public:
                on_check_function on_check_func,
                session_special_update_function update_func_arg,
                session_special_read_function read_func_arg,
-               uint deprecated_version=0, const char *substitute=0)
+               const char *substitute=0)
     : Sys_var_ulonglong(name_arg, comment, flag_args, 0,
               sizeof(ulonglong), getopt, min_val,
               max_val, 0, block_size, lock, binlog_status_arg, on_check_func, 0,
-              deprecated_version, substitute),
+              substitute),
       read_func(read_func_arg), update_func(update_func_arg)
   {
     DBUG_ASSERT(scope() == ONLY_SESSION);
@@ -1393,12 +1393,12 @@ public:
                enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
                on_check_function on_check_func=0,
                on_update_function on_update_func=0,
-               uint deprecated_version=0, const char *substitute=0,
+               const char *substitute=0,
                int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, SHOW_CHAR, 0,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag)
+              substitute, parse_flag)
   {
     DBUG_ASSERT(scope() == GLOBAL);
     DBUG_ASSERT(getopt.id == -1);
@@ -1462,12 +1462,12 @@ public:
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
           on_update_function on_update_func=0,
-          uint deprecated_version=0, const char *substitute=0,
+          const char *substitute=0,
           int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, SHOW_CHAR, (intptr)def_val,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag),
+              substitute, parse_flag),
       name_offset(name_off)
   {
     option.var_type= GET_STR;
@@ -1532,12 +1532,12 @@ public:
              enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
              on_check_function on_check_func=0,
              on_update_function on_update_func=0,
-             uint deprecated_version=0, const char *substitute=0,
+             const char *substitute=0,
              int parse_flag= PARSE_NORMAL)
     : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id,
               getopt.arg_type, SHOW_CHAR, (intptr)def_val,
               lock, binlog_status_arg, on_check_func, on_update_func,
-              deprecated_version, substitute, parse_flag)
+              substitute, parse_flag)
   {
     DBUG_ASSERT(getopt.id == -1);
     DBUG_ASSERT(size == sizeof(Time_zone *));

Attachment: [text/bzr-bundle] bzr/magne.mahre@oracle.com-20101025092053-8j6jwwa4fqh9ev5p.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (magne.mahre:3332) WL#5265Magne Mahre25 Oct