More updates for using NDB as default and some bug fixes along the way

9 files changed, 51 insertions, 39 deletions

diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result
index 8482f631553..0f772a7d288 100644
--- a/mysql-test/r/rpl_insert_id.result
+++ b/mysql-test/r/rpl_insert_id.result
@@ -4,18 +4,18 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-create table t1(a int auto_increment, key(a));
-create table t2(b int auto_increment, c int, key(b));
+create table t1(a int auto_increment, PRIMARY key(a));
+create table t2(b int auto_increment, c int, PRIMARY key(b));
 insert into t1 values (1),(2),(3);
 insert into t1 values (null);
 insert into t2 values (null,last_insert_id());
-select * from t1;
+select * from t1 ORDER BY a;
 a
 1
 2
 3
 4
-select * from t2;
+select * from t2 ORDER BY b;
 b	c
 1	4
 drop table t1;
@@ -40,26 +40,26 @@ b	c
 6	11
 drop table t2;
 drop table t1;
-create table t1(a int auto_increment, key(a));
-create table t2(b int auto_increment, c int, key(b));
+create table t1(a int auto_increment, PRIMARY key(a));
+create table t2(b int auto_increment, c int, PRIMARY key(b));
 insert into t1 values (10);
 insert into t1 values (null),(null),(null);
 insert into t2 values (5,0);
-insert into t2 (c) select * from t1;
-select * from t2;
+insert into t2 (c) select * from t1 ORDER BY a;
+select * from t2 ORDER BY b;
 b	c
 5	0
 6	10
 7	11
 8	12
 9	13
-select * from t1;
+select * from t1 ORDER BY a;
 a
 10
 11
 12
 13
-select * from t2;
+select * from t2 ORDER BY b;
 b	c
 5	0
 6	10
@@ -72,4 +72,4 @@ SET TIMESTAMP=1000000000;
 CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
-ERROR 23000: Duplicate entry '1' for key 1
+Got one of the listed errors
diff --git a/mysql-test/r/rpl_ndb_log.result b/mysql-test/r/rpl_ndb_log.result
index 523495e284f..5238943e725 100644
--- a/mysql-test/r/rpl_ndb_log.result
+++ b/mysql-test/r/rpl_ndb_log.result
@@ -32,6 +32,8 @@ master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not nul
 master-bin.000001	#	Query	1	#	BEGIN
 master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
 master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Table_map	1	#	test.t1
+master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Query	1	#	COMMIT
 master-bin.000001	#	Query	1	#	use `test`; drop table t1
 show binlog events from 102 limit 1;
@@ -68,6 +70,8 @@ master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not nul
 master-bin.000001	#	Query	1	#	BEGIN
 master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
 master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Table_map	1	#	test.t1
+master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Query	1	#	COMMIT
 master-bin.000001	#	Query	1	#	use `test`; drop table t1
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
@@ -90,12 +94,12 @@ master-bin.000002	#	Query	1	#	COMMIT
 master-bin.000002	#	Query	1	#	use `test`; drop table t1
 show binary logs;
 Log_name	File_size
-master-bin.000001	1087
+master-bin.000001	1798
 master-bin.000002	991
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1494
+slave-bin.000001	2205
 slave-bin.000002	583
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -112,6 +116,8 @@ slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null
 slave-bin.000001	#	Query	2	#	BEGIN
 slave-bin.000001	#	Table_map	2	#	cluster_replication.apply_status
 slave-bin.000001	#	Write_rows	2	#	
+slave-bin.000001	#	Table_map	2	#	test.t1
+slave-bin.000001	#	Write_rows	2	#	
 slave-bin.000001	#	Query	2	#	COMMIT
 slave-bin.000001	#	Query	1	#	use `test`; drop table t1
 slave-bin.000001	#	Query	1	#	use `test`; create table t5 (a int)ENGINE=NDB
diff --git a/mysql-test/r/rpl_row_001.result b/mysql-test/r/rpl_row_001.result
index 990ebbc5d7a..b07a99644fc 100644
--- a/mysql-test/r/rpl_row_001.result
+++ b/mysql-test/r/rpl_row_001.result
@@ -7,25 +7,25 @@ start slave;
 CREATE TABLE t1 (word CHAR(20) NOT NULL);
 LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
 LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
-SELECT * FROM t1 LIMIT 10;
+SELECT * FROM t1  ORDER BY word LIMIT 10;
 word
 Aarhus
+Aarhus
+Aarhus
+Aarhus
+Aaron
 Aaron
+Aaron
+Aaron
+Ababa
 Ababa
-aback
-abaft
-abandon
-abandoned
-abandoning
-abandonment
-abandons
 STOP SLAVE;
 SET PASSWORD FOR root@"localhost" = PASSWORD('foo');
 START SLAVE;
 SET PASSWORD FOR root@"localhost" = PASSWORD('');
 CREATE TABLE t3(n INT);
 INSERT INTO t3 VALUES(1),(2);
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY n;
 n
 1
 2
diff --git a/mysql-test/r/rpl_row_blob_innodb.result b/mysql-test/r/rpl_row_blob_innodb.result
index 92671f10ab9..713ac8bae81 100644
--- a/mysql-test/r/rpl_row_blob_innodb.result
+++ b/mysql-test/r/rpl_row_blob_innodb.result
@@ -9,7 +9,7 @@ DROP TABLE IF EXISTS test.t2;
 *****  Table Create Section ****
 
 CREATE TABLE test.t1 (c1 int not null auto_increment, 
-data LONGBLOB, PRIMARY KEY(c1))ENGINE=$engine_type;
+data LONGBLOB, PRIMARY KEY(c1))ENGINE=engine_type;
 
 **** Data Insert Section test.t1 *****
 
@@ -76,7 +76,7 @@ c1 INT NOT NULL PRIMARY KEY,
 c2 TEXT,
 c3 INT,
 c4 LONGBLOB,
-KEY(c3))ENGINE=$engine_type;
+KEY(c3))ENGINE=engine_type;
 
 *** Setup Values For test.t2 ***
 set @x0 = '01234567012345670123456701234567';
diff --git a/mysql-test/r/rpl_row_blob_myisam.result b/mysql-test/r/rpl_row_blob_myisam.result
index 92671f10ab9..713ac8bae81 100644
--- a/mysql-test/r/rpl_row_blob_myisam.result
+++ b/mysql-test/r/rpl_row_blob_myisam.result
@@ -9,7 +9,7 @@ DROP TABLE IF EXISTS test.t2;
 *****  Table Create Section ****
 
 CREATE TABLE test.t1 (c1 int not null auto_increment, 
-data LONGBLOB, PRIMARY KEY(c1))ENGINE=$engine_type;
+data LONGBLOB, PRIMARY KEY(c1))ENGINE=engine_type;
 
 **** Data Insert Section test.t1 *****
 
@@ -76,7 +76,7 @@ c1 INT NOT NULL PRIMARY KEY,
 c2 TEXT,
 c3 INT,
 c4 LONGBLOB,
-KEY(c3))ENGINE=$engine_type;
+KEY(c3))ENGINE=engine_type;
 
 *** Setup Values For test.t2 ***
 set @x0 = '01234567012345670123456701234567';
diff --git a/mysql-test/r/rpl_row_trig002.result b/mysql-test/r/rpl_row_trig002.result
index 62dc2f17562..794104db750 100644
--- a/mysql-test/r/rpl_row_trig002.result
+++ b/mysql-test/r/rpl_row_trig002.result
@@ -13,14 +13,14 @@ CREATE TABLE test.t3 (value CHAR(30),domain_id INT, mailaccount_id INT, program
 CREATE TABLE test.t1 (id INT,domain CHAR(30),PRIMARY KEY(id));
 CREATE TRIGGER test.t2_ai AFTER INSERT ON test.t2 FOR EACH ROW UPDATE test.t3 ms, test.t1 d  SET ms.value='No' WHERE ms.domain_id = (SELECT max(id) FROM test.t1 WHERE domain='example.com') AND ms.mailaccount_id IS NULL  AND ms.program='spamfilter' AND ms.keey='scan_incoming'|
 INSERT INTO test.t1 VALUES (1, 'example.com'),(2, 'mysql.com'),(3, 'earthmotherwear.com'), (4, 'yahoo.com'),(5, 'example.com');
-select * from test.t1;
+SELECT * FROM test.t1 ORDER BY id;
 id	domain
 1	example.com
 2	mysql.com
 3	earthmotherwear.com
 4	yahoo.com
 5	example.com
-select * from test.t1;
+SELECT * FROM test.t1 ORDER BY id;
 id	domain
 1	example.com
 2	mysql.com
@@ -45,13 +45,19 @@ value	domain_id	mailaccount_id	program	keey
 No	5	NULL	spamfilter	scan_incoming
 Yes	1	NULL	spamfilter	scan_incoming
 DELETE FROM test.t1 WHERE id = 1;
-select * from test.t1;
+SELECT * FROM test.t1 ORDER BY id;
 id	domain
 2	mysql.com
 3	earthmotherwear.com
 4	yahoo.com
 5	example.com
-select * from test.t1;
+SELECT * FROM test.t1 ORDER BY id;
+id	domain
+2	mysql.com
+3	earthmotherwear.com
+4	yahoo.com
+5	example.com
+SELECT * FROM test.t1 ORDER BY id;
 id	domain
 2	mysql.com
 3	earthmotherwear.com
diff --git a/mysql-test/r/rpl_skip_error.result b/mysql-test/r/rpl_skip_error.result
index e52426c381c..c66e73d7c59 100644
--- a/mysql-test/r/rpl_skip_error.result
+++ b/mysql-test/r/rpl_skip_error.result
@@ -8,7 +8,7 @@ create table t1 (n int not null primary key);
 insert into t1 values (1);
 insert into t1 values (1);
 insert into t1 values (2),(3);
-select * from t1;
+select * from t1 ORDER BY n;
 n
 1
 2
diff --git a/mysql-test/r/rpl_sporadic_master.result b/mysql-test/r/rpl_sporadic_master.result
index 789c3bf2b2b..14fb673a081 100644
--- a/mysql-test/r/rpl_sporadic_master.result
+++ b/mysql-test/r/rpl_sporadic_master.result
@@ -15,7 +15,7 @@ insert into t1 values (NULL),(NULL);
 flush logs;
 truncate table t1;
 insert into t1 values (10),(NULL),(NULL),(NULL),(NULL),(NULL);
-select * from t1;
+select * from t1 ORDER BY n;
 n
 10
 11
diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result
index a7dbfd44944..24900fab56a 100644
--- a/mysql-test/r/rpl_temporary.result
+++ b/mysql-test/r/rpl_temporary.result
@@ -24,15 +24,15 @@ drop table if exists t1,t2;
 create table t1(f int);
 create table t2(f int);
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 insert into t3 select * from t1 where f<6;
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 insert into t2 select count(*) from t3;
 insert into t3 select * from t1 where f>=4;
 drop temporary table t3;
 insert into t2 select count(*) from t3;
 drop temporary table t3;
-select * from t2;
+select * from t2 ORDER BY f;
 f
 5
 7
@@ -46,13 +46,13 @@ SET TIMESTAMP=1040323938;
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 SET TIMESTAMP=1040323945;
 SET @@session.pseudo_thread_id=1;
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 SET TIMESTAMP=1040323952;
 SET @@session.pseudo_thread_id=1;
 insert into t3 select * from t1 where f<6;
 SET TIMESTAMP=1040324145;
 SET @@session.pseudo_thread_id=2;
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 SET TIMESTAMP=1040324186;
 SET @@session.pseudo_thread_id=1;
 insert into t2 select count(*) from t3;
@@ -68,9 +68,9 @@ insert into t2 select count(*) from t3;
 SET TIMESTAMP=1040324224;
 SET @@session.pseudo_thread_id=2;
 drop temporary table t3;
-select * from t2;
+select * from t2 ORDER BY f;
 f
 5
 7
 drop table t1,t2;
-create temporary table t3 (f int);
+create temporary table t3 (f int)ENGINE=MyISAM;