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
3324 magnus.blaudd@oracle.com 2011-06-09
ndb
- update .result files for rpl_ndb test which depend on extra/rpl_tests
modified:
mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
3323 magnus.blaudd@strippedom 2011-06-09 [merge]
Merge 5.5-cluster -> trunk-cluster
modified:
client/mysqltest.cc
=== 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
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result 2011-05-12 08:59:16 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result 2011-06-09 20:26:32 +0000
@@ -871,6 +871,25 @@ c1 hex(c4) c5
2 6231623162316231 JOE
3 6231623162316231 QA
DROP TABLE t5;
+
+include/rpl_reset.inc
+SET NAMES utf8;
+SET SQL_LOG_BIN=0;
+CREATE TABLE t1 (c1 INT NOT NULL, c2 CHAR(255) CHARACTER SET UTF8 NOT NULL) ENGINE='NDB';
+SET SQL_LOG_BIN=1;
+CREATE TABLE t1 (c1 INT) ENGINE='NDB';
+INSERT INTO t1 VALUES ();
+SET @text= REPEAT(_utf8'ç', 255);
+INSERT INTO t1 VALUES (1, @text);
+SELECT * FROM t1;
+c1 c2
+1 ççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç+DROP TABLE t1;
set binlog_format=mixed;
***********************************************************
@@ -1742,4 +1761,23 @@ c1 hex(c4) c5
2 6231623162316231 JOE
3 6231623162316231 QA
DROP TABLE t5;
+
+include/rpl_reset.inc
+SET NAMES utf8;
+SET SQL_LOG_BIN=0;
+CREATE TABLE t1 (c1 INT NOT NULL, c2 CHAR(255) CHARACTER SET UTF8 NOT NULL) ENGINE='NDB';
+SET SQL_LOG_BIN=1;
+CREATE TABLE t1 (c1 INT) ENGINE='NDB';
+INSERT INTO t1 VALUES ();
+SET @text= REPEAT(_utf8'ç', 255);
+INSERT INTO t1 VALUES (1, @text);
+SELECT * FROM t1;
+c1 c2
+1 çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç+0
+1
+DROP TABLE t1;
include/rpl_end.inc
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result 2011-05-10 12:32:21 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result 2011-06-09 20:26:32 +0000
@@ -1,6 +1,6 @@
include/master-slave.inc
[connection master]
-call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
+call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
**** Diff Table Def Start ****
*** On Slave ***
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result 2011-04-15 11:41:33 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result 2011-06-09 20:26:32 +0000
@@ -120,10 +120,10 @@ i j x y z
DROP TABLE t1, t2, t3;
DROP TABLE IF EXISTS t1;
Warnings:
-Note 1051 Unknown table 't1'
+Note 1051 Unknown table 'test.t1'
DROP TABLE IF EXISTS t2;
Warnings:
-Note 1051 Unknown table 't2'
+Note 1051 Unknown table 'test.t2'
CREATE TABLE t1 (
idp int(11) NOT NULL default '0',
idpro int(11) default NULL,
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-trunk-cluster branch (magnus.blaudd:3323 to 3325) | magnus.blaudd | 10 Jun |
