From: magnus.blaudd
Date: June 9 2011 8:46pm
Subject: bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3325)
List-Archive: http://lists.mysql.com/commits/139010
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7566708149529898016=="

--===============7566708149529898016==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@stripped

 3325 magnus.blaudd@stripped	2011-06-09
      ndb
       - switch fromusing storage_engine to default_storage_engine since
         storage_engine variable is due to be removed

    modified:
      mysql-test/suite/ndb/r/ndb_load.result
      mysql-test/suite/ndb/t/ndb_load.test
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test
=== modified file 'mysql-test/suite/ndb/r/ndb_load.result'
--- a/mysql-test/suite/ndb/r/ndb_load.result	2011-01-21 12:21:05 +0000
+++ b/mysql-test/suite/ndb/r/ndb_load.result	2011-06-09 20:45:11 +0000
@@ -127,13 +127,13 @@ Now check bulk insert using create .. as
 SHOW VARIABLES LIKE 'storage_engine';
 Variable_name	Value
 storage_engine	MyISAM
-SET storage_engine="ndb";
+SET default_storage_engine="ndb";
 CREATE TABLE t2 AS SELECT * FROM t1;
 SELECT COUNT(*) FROM t2;
 COUNT(*)
 15000
 DROP TABLE t2;
-SET storage_engine="MyIsam";
+SET default_storage_engine="MyIsam";
 Now check Alter table to Ndb
 ALTER TABLE t1 ENGINE= Ndb;
 SELECT COUNT(*) FROM t1;

=== modified file 'mysql-test/suite/ndb/t/ndb_load.test'
--- a/mysql-test/suite/ndb/t/ndb_load.test	2011-01-21 12:21:05 +0000
+++ b/mysql-test/suite/ndb/t/ndb_load.test	2011-06-09 20:45:11 +0000
@@ -79,7 +79,7 @@ DROP TABLE t2;
 
 --echo Now check bulk insert using create .. as select.
 SHOW VARIABLES LIKE 'storage_engine';
-SET storage_engine="ndb";
+SET default_storage_engine="ndb";
 
 CREATE TABLE t2 AS SELECT * FROM t1;
 
@@ -87,7 +87,7 @@ SELECT COUNT(*) FROM t2;
 
 DROP TABLE t2;
 
-SET storage_engine="MyIsam";
+SET default_storage_engine="MyIsam";
 
 --echo Now check Alter table to Ndb
 ALTER TABLE t1 ENGINE= Ndb;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result	2011-05-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result	2011-06-09 20:45:11 +0000
@@ -1,6 +1,6 @@
 include/master-slave.inc
 [connection master]
-SET storage_engine=ndb;
+SET default_storage_engine=ndb;
 
 === NDB -> NDB ===
 

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result	2011-06-09 20:45:11 +0000
@@ -1,6 +1,6 @@
 include/master-slave.inc
 [connection master]
-SET storage_engine=ndb;
+SET default_storage_engine=ndb;
 
 === NDB -> MYISAM ===
 
@@ -14,8 +14,8 @@ log_name VARCHAR(255) BINARY NOT NULL,
 start_pos BIGINT UNSIGNED NOT NULL,
 end_pos BIGINT UNSIGNED NOT NULL,
 PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
-SET @old_slave_storage_engine=@@global.storage_engine;
-SET @@global.storage_engine=myisam;
+SET @old_slave_storage_engine=@@global.default_storage_engine;
+SET @@global.default_storage_engine=myisam;
 include/start_slave.inc
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
@@ -414,7 +414,7 @@ include/stop_slave.inc
 
 [connection slave]
 alter table mysql.ndb_apply_status engine=innodb;
-SET @@global.storage_engine=innodb;
+SET @@global.default_storage_engine=innodb;
 include/start_slave.inc
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
@@ -811,4 +811,4 @@ include/stop_slave.inc
 [connection slave]
 drop table mysql.ndb_apply_status;
 set @@global.slave_exec_mode= @old_slave_exec_mode;
-SET @@global.storage_engine=@old_slave_storage_engine;
+SET @@global.default_storage_engine=@old_slave_storage_engine;

=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result	2011-05-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result	2011-06-09 20:45:11 +0000
@@ -1,6 +1,6 @@
 include/master-slave.inc
 [connection master]
-SET storage_engine=innodb;
+SET default_storage_engine=innodb;
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
 --- Start test 1 Basic testing ---

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test	2011-06-09 20:45:11 +0000
@@ -39,7 +39,7 @@ CREATE TABLE mysql.ndb_apply_status
 -- connection master
 --disable_query_log
 set new=on;
-set storage_engine=ndbcluster;
+set default_storage_engine=ndbcluster;
 --enable_query_log
 
 --source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test	2011-06-09 20:45:11 +0000
@@ -38,7 +38,7 @@ CREATE TABLE mysql.ndb_apply_status
 -- connection master
 --disable_query_log
 set new=on;
-set storage_engine=ndbcluster;
+set default_storage_engine=ndbcluster;
 --enable_query_log
 
 --source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test	2011-05-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test	2011-06-09 20:45:11 +0000
@@ -10,7 +10,7 @@
 
 # On master use NDB as storage engine.
 connection master;
-SET storage_engine=ndb;
+SET default_storage_engine=ndb;
 
 --echo
 --echo === NDB -> NDB ===

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test	2011-06-09 20:45:11 +0000
@@ -12,7 +12,7 @@ let $rpl_skip_start_slave= 1; # Don't st
 --source include/master-slave.inc
 
 # On master use NDB as storage engine.
-SET storage_engine=ndb;
+SET default_storage_engine=ndb;
 
 --echo
 --echo === NDB -> MYISAM ===
@@ -37,8 +37,8 @@ CREATE TABLE mysql.ndb_apply_status
                    PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
 
 # Reconfigure slave to use MyISAM as default engine
-SET @old_slave_storage_engine=@@global.storage_engine;
-SET @@global.storage_engine=myisam;
+SET @old_slave_storage_engine=@@global.default_storage_engine;
+SET @@global.default_storage_engine=myisam;
 
 --source include/start_slave.inc
 --source suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
@@ -53,7 +53,7 @@ SET @@global.storage_engine=myisam;
 --source include/rpl_connection_slave.inc
 
 alter table mysql.ndb_apply_status engine=innodb;
-SET @@global.storage_engine=innodb;
+SET @@global.default_storage_engine=innodb;
 
 --source include/start_slave.inc
 --source suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
@@ -64,5 +64,5 @@ SET @@global.storage_engine=innodb;
 --source include/rpl_connection_slave.inc
 drop table mysql.ndb_apply_status;
 set @@global.slave_exec_mode= @old_slave_exec_mode;
-SET @@global.storage_engine=@old_slave_storage_engine;
+SET @@global.default_storage_engine=@old_slave_storage_engine;
 

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test	2011-05-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test	2011-06-09 20:45:11 +0000
@@ -11,6 +11,6 @@
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
 -- source suite/ndb_rpl/ndb_master-slave.inc
-SET storage_engine=innodb;
+SET default_storage_engine=innodb;
 --source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc
 --source include/rpl_end.inc


--===============7566708149529898016==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   fotc6x0esckycx3u
# target_branch: file:///data0/magnus/mysql/trunk-cluster/
# testament_sha1: 4abb93e05473caf8c6bddaea4662ef277a4f1517
# timestamp: 2011-06-09 22:46:28 +0200
# source_branch: file:///data0/magnus/mysql/5.5-cluster/
# base_revision_id: magnus.blaudd@stripped\
#   jm5fomvk1wd7pvht
# 
# Begin bundle
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
85FGDU8OySWvHLvE/cib7OM1p/k/89/LDUYxP6aecbonZy/pHt5vJmj+XPZxetXePV5vV38LDexb
2uYr21xfjTTCbPR0bHiJ9Olq17r8hNDJrHkbzW/p7uZ2iVdsDUJ5pC4+jaizYkKkf8Nfrt7MnRPk
bFFw1qRGSNnZqnBqbYhSZar3nNNzu9on/9/iRRFXJ+p3YI1cF/R6xpf02eT5cWfs0TTpkb1q4w2q
T7cnEc99MGhvbm1bI/KOXmy+WVYm/S2E2HgLNqlFeIsFbVrWxkTJrqxkS7/aNWp4L4nSJ+tGSS2h
OSQrJ1Y8P18Pp9NSTVEv+Iyfw+ZIW5zTE/ljRekNIi+fqsqJ5p05NPuzFeSR6fD1qihLZGNHVgJq
zxfLG1fL3FY4PGdKft5NiN0d2iWYf5e10Pp8z8uXsuVSQur0ykjJHH92yPVdfpynr+PT0u8qB8h8
Mst71ZUcFs/w696XJCxcX+X/rCPw0QmmdOjirDbRuR02ZxLEaie1T0YlTlOrqPuqqqqqq/Uhx5gh
pNvmECb4loq1iqLLe9jnHkUlFD0UKs8vuxhajaRZEXuKnmJXixX2K0Gu+aAxRqIpkmin53NrtqMW
YjYXYVJYNVijuyOckanSeqmxIU9l2aPdyqwoMIjTLVmhva0h9ap5Ob28aGt1P46fD8t5s2TpdGbX
E+26YNLVtc5X50mE+5a1LX9z7Oscpoda4OLu8Ouz11iaRPNzcHhgb/hudnhYoxiOxZi85YcWp/p7
iZvOPRtPDxai91am/W0tDU3ubFx2fp2QRAwY4TCcfxdyRThQkNP/YLk=


--===============7566708149529898016==--