3335 Magne Mahre 2010-10-26
WL#5265 Deprecations
Post-push fixes.
* Fixed regression tests in the 'parts' suite
* Fixed MS Windows specific regression tests
modified:
mysql-test/r/mysqld--help-win.result
mysql-test/r/named_pipe.result
mysql-test/r/shm.result
mysql-test/suite/parts/inc/partition.pre
mysql-test/suite/parts/inc/partition_engine.inc
mysql-test/suite/parts/inc/partition_syntax_2.inc
mysql-test/suite/parts/inc/partition_value.inc
mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
mysql-test/suite/parts/r/partition_alter1_1_innodb.result
mysql-test/suite/parts/r/partition_alter1_1_myisam.result
mysql-test/suite/parts/r/partition_alter1_2_innodb.result
mysql-test/suite/parts/r/partition_alter1_2_myisam.result
mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
mysql-test/suite/parts/r/partition_alter2_1_myisam.result
mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
mysql-test/suite/parts/r/partition_alter2_2_myisam.result
mysql-test/suite/parts/r/partition_alter3_innodb.result
mysql-test/suite/parts/r/partition_alter3_myisam.result
mysql-test/suite/parts/r/partition_alter4_innodb.result
mysql-test/suite/parts/r/partition_alter4_myisam.result
mysql-test/suite/parts/r/partition_basic_innodb.result
mysql-test/suite/parts/r/partition_basic_myisam.result
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
mysql-test/suite/parts/r/partition_engine_innodb.result
mysql-test/suite/parts/r/partition_engine_myisam.result
mysql-test/suite/parts/r/partition_syntax_innodb.result
mysql-test/suite/parts/r/partition_syntax_myisam.result
3334 Alexander Nozdrin 2010-10-26
After merge fix: use new syntax instead of deprecated one.
modified:
mysql-test/suite/innodb/r/innodb_bug56632.result
mysql-test/suite/innodb/t/innodb_bug56632.test
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result 2010-10-26 09:10:59 +0000
+++ b/mysql-test/r/mysqld--help-win.result 2010-10-26 10:10:58 +0000
@@ -211,7 +211,7 @@ The following options may be given as th
-L, --language=name Client error messages in given language. May be given as
a full path. Deprecated. Use --lc-messages-dir instead.
--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
@@ -286,7 +286,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/named_pipe.result'
--- a/mysql-test/r/named_pipe.result 2010-06-11 08:57:45 +0000
+++ b/mysql-test/r/named_pipe.result 2010-10-26 10:10:58 +0000
@@ -508,7 +508,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
@@ -521,7 +521,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
@@ -558,7 +558,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
@@ -571,7 +571,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/shm.result'
--- a/mysql-test/r/shm.result 2010-06-11 08:57:45 +0000
+++ b/mysql-test/r/shm.result 2010-10-26 10:10:58 +0000
@@ -508,7 +508,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
@@ -521,7 +521,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
@@ -558,7 +558,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
@@ -571,7 +571,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/suite/parts/inc/partition.pre'
--- a/mysql-test/suite/parts/inc/partition.pre 2008-01-10 15:50:37 +0000
+++ b/mysql-test/suite/parts/inc/partition.pre 2010-10-26 10:10:58 +0000
@@ -23,13 +23,13 @@
################################################################################
# Set the session storage engine
-eval SET @@session.storage_engine = $engine;
+eval SET @@session.default_storage_engine = $engine;
##### Disabled/affected testcases, because of open bugs #####
# --echo
# --echo #------------------------------------------------------------------------
# --echo # There are several testcases disabled because of the open bugs
-# if (`SELECT @@session.storage_engine IN('ndbcluster')`)
+# if (`SELECT @@session.default_storage_engine IN('ndbcluster')`)
# {
# --echo # #18730
# }
@@ -135,7 +135,7 @@ f_charbig VARCHAR(1000);
# in partition_methods[1|2].inc and partition_alter_1[1|3].inc
# when $sub_part_no is set to >= 3.
let $sub_part_no= 3;
-if (`SELECT @@session.storage_engine = 'ndbcluster'`)
+if (`SELECT @@session.default_storage_engine = 'ndbcluster'`)
{
let $sub_part_no= 2;
}
@@ -316,7 +316,7 @@ if (0)
# --source inc/have_partition.inc
# b) Engine specific settings and requirements
# $do_pk_tests, $MAX_VALUE, $engine
-# SET SESSION storage_engine
+# SET SESSION default_storage_engine
# $engine_other
# c) Generate the prerequisites ($variables, @variables, tables) needed
# via
=== modified file 'mysql-test/suite/parts/inc/partition_engine.inc'
--- a/mysql-test/suite/parts/inc/partition_engine.inc 2008-02-25 20:18:50 +0000
+++ b/mysql-test/suite/parts/inc/partition_engine.inc 2010-10-26 10:10:58 +0000
@@ -262,7 +262,7 @@ DROP TABLE t1;
--echo #------------------------------------------------------------------------
--echo # 6 Session default engine differs from engine used within create table
--echo #------------------------------------------------------------------------
-eval SET SESSION storage_engine=$engine_other;
+eval SET SESSION default_storage_engine=$engine_other;
# Bug#16775 Partitions: strange effects on subpartitioned tables, mixed storage engines
# Bug#15966 Partitions: crash if session default engine <> engine used in create table
eval CREATE TABLE t1 (
@@ -286,4 +286,4 @@ INSERT INTO t1(f_int1,f_int2,f_char1,f_c
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
--source suite/parts/inc/partition_check.inc
DROP TABLE t1;
-eval SET SESSION storage_engine=$engine;
+eval SET SESSION default_storage_engine=$engine;
=== modified file 'mysql-test/suite/parts/inc/partition_syntax_2.inc'
--- a/mysql-test/suite/parts/inc/partition_syntax_2.inc 2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/inc/partition_syntax_2.inc 2010-10-26 10:10:58 +0000
@@ -12,7 +12,7 @@
# Change: #
################################################################################
-if (`SELECT @@session.storage_engine NOT IN('ndbcluster')`)
+if (`SELECT @@session.default_storage_engine NOT IN('ndbcluster')`)
{
--error ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
eval CREATE TABLE t1 (
@@ -27,7 +27,7 @@ if (`SELECT @@session.storage_engine NOT
)
$partition_scheme;
}
-if (`SELECT @@session.storage_engine IN('ndbcluster')`)
+if (`SELECT @@session.default_storage_engine IN('ndbcluster')`)
{
eval CREATE TABLE t1 (
$column_list,
=== modified file 'mysql-test/suite/parts/inc/partition_value.inc'
--- a/mysql-test/suite/parts/inc/partition_value.inc 2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/inc/partition_value.inc 2010-10-26 10:10:58 +0000
@@ -83,7 +83,7 @@ DROP TABLE t1;
#
# The NDB handler only supports 32 bit integers in VALUES
# therefor we have to skip the next test for NDB.
-if (`SELECT @@session.storage_engine NOT IN('ndbcluster')`)
+if (`SELECT @@session.default_storage_engine NOT IN('ndbcluster')`)
{
--echo # 3. LIST(<check value>)
eval CREATE TABLE t1 (
=== modified file 'mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter1_1_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter1_1_innodb.result 2009-02-18 21:35:28 +0000
+++ b/mysql-test/suite/parts/r/partition_alter1_1_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter1_1_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result 2009-02-18 21:35:28 +0000
+++ b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter1_2_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter1_2_innodb.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter1_2_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter1_2_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter2_1_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter2_1_myisam.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter2_1_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter2_2_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter2_2_myisam.result 2009-11-25 08:19:34 +0000
+++ b/mysql-test/suite/parts/r/partition_alter2_2_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter3_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter3_innodb.result 2010-10-08 09:34:08 +0000
+++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter3_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter3_myisam.result 2010-08-27 08:43:51 +0000
+++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter4_innodb.result'
--- a/mysql-test/suite/parts/r/partition_alter4_innodb.result 2008-11-04 07:43:21 +0000
+++ b/mysql-test/suite/parts/r/partition_alter4_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_alter4_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter4_myisam.result 2008-11-12 17:51:47 +0000
+++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_basic_innodb.result'
--- a/mysql-test/suite/parts/r/partition_basic_innodb.result 2010-10-08 09:34:08 +0000
+++ b/mysql-test/suite/parts/r/partition_basic_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_basic_myisam.result'
--- a/mysql-test/suite/parts/r/partition_basic_myisam.result 2009-02-18 21:35:28 +0000
+++ b/mysql-test/suite/parts/r/partition_basic_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_basic_symlink_myisam.result'
--- a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result 2009-02-18 21:35:28 +0000
+++ b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_engine_innodb.result'
--- a/mysql-test/suite/parts/r/partition_engine_innodb.result 2008-11-04 07:43:21 +0000
+++ b/mysql-test/suite/parts/r/partition_engine_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
@@ -4294,7 +4294,7 @@ DROP TABLE t1;
#------------------------------------------------------------------------
# 6 Session default engine differs from engine used within create table
#------------------------------------------------------------------------
-SET SESSION storage_engine='MEMORY';
+SET SESSION default_storage_engine='MEMORY';
CREATE TABLE t1 (
f_int1 INTEGER,
f_int2 INTEGER,
@@ -5200,7 +5200,7 @@ TRUNCATE t1;
# check layout success: 1
# End usability test (inc/partition_check.inc)
DROP TABLE t1;
-SET SESSION storage_engine='InnoDB';
+SET SESSION default_storage_engine='InnoDB';
DROP VIEW IF EXISTS v1;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t0_aux;
=== modified file 'mysql-test/suite/parts/r/partition_engine_myisam.result'
--- a/mysql-test/suite/parts/r/partition_engine_myisam.result 2008-11-12 17:51:47 +0000
+++ b/mysql-test/suite/parts/r/partition_engine_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
@@ -4399,7 +4399,7 @@ DROP TABLE t1;
#------------------------------------------------------------------------
# 6 Session default engine differs from engine used within create table
#------------------------------------------------------------------------
-SET SESSION storage_engine='MEMORY';
+SET SESSION default_storage_engine='MEMORY';
CREATE TABLE t1 (
f_int1 INTEGER,
f_int2 INTEGER,
@@ -5321,7 +5321,7 @@ TRUNCATE t1;
# check layout success: 1
# End usability test (inc/partition_check.inc)
DROP TABLE t1;
-SET SESSION storage_engine='MyISAM';
+SET SESSION default_storage_engine='MyISAM';
DROP VIEW IF EXISTS v1;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t0_aux;
=== modified file 'mysql-test/suite/parts/r/partition_syntax_innodb.result'
--- a/mysql-test/suite/parts/r/partition_syntax_innodb.result 2009-10-21 16:27:34 +0000
+++ b/mysql-test/suite/parts/r/partition_syntax_innodb.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'InnoDB';
+SET @@session.default_storage_engine = 'InnoDB';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
=== modified file 'mysql-test/suite/parts/r/partition_syntax_myisam.result'
--- a/mysql-test/suite/parts/r/partition_syntax_myisam.result 2009-10-21 16:27:34 +0000
+++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result 2010-10-26 10:10:58 +0000
@@ -1,5 +1,5 @@
SET @max_row = 20;
-SET @@session.storage_engine = 'MyISAM';
+SET @@session.default_storage_engine = 'MyISAM';
#------------------------------------------------------------------------
# 0. Setting of auxiliary variables + Creation of an auxiliary tables
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-next-mr-bugfixing branch (magne.mahre:3334 to 3335)WL#5265 | Magne Mahre | 26 Oct |
