Commit 68b51ff0 authored by unknown's avatar unknown
Browse files

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


mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/r/rpl_insert_id.result:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/t/rpl_skip_error.test:
  updated to wrk with ndb
mysql-test/r/rpl_skip_error.result:
  updated to wrk with ndb
mysql-test/t/rpl_sporadic_master.test:
  updated to wrk with ndb
mysql-test/r/rpl_sporadic_master.result:
  updated to wrk with ndb
mysql-test/t/rpl_row_trig002.test:
  updated to work with NDB engine
mysql-test/r/rpl_row_trig002.result:
  updated to work with NDB engine
mysql-test/t/rpl_temporary.test:
  updated to work with NDB engine
mysql-test/r/rpl_temporary.result:
  updated to work with NDB engine
mysql-test/extra/rpl_tests/rpl_row_001.test:
  updated to work with NDB as default engine
mysql-test/r/rpl_row_001.result:
  updated to work with NDB as default engine
mysql-test/t/rpl_row_blob_innodb.test:
  Fixed bug in test case
mysql-test/t/rpl_row_blob_innodb-slave.opt:
  Added slave option file to ensure correct engine type on slave
mysql-test/r/rpl_row_blob_innodb.result:
  Updated results
mysql-test/r/rpl_row_blob_myisam.result:
  Updated results
mysql-test/r/rpl_ndb_log.result:
  update results file
parent 642762bd

mysql-test/extra/rpl_tests/rpl_insert_id.test

+14 −11
Original line number Diff line number Diff line 
###########################################################

# 2006-02-01: By JBM: Added 1022, ORDER BY and PK for NDB

###########################################################

# See if queries that use both auto_increment and LAST_INSERT_ID()

# are replicated well
@@ -7,16 +10,16 @@ 
#should work for both SBR and RBR



connection master;

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());

save_master_pos;

connection slave;

sync_with_master;

select * from t1;

select * from t2;

select * from t1 ORDER BY a;

select * from t2 ORDER BY b;

connection master;

#check if multi-line inserts,

#which set last_insert_id to the first id inserted,
@@ -44,18 +47,18 @@ connection master; 


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;

save_master_pos;

connection slave;

sync_with_master;

select * from t1;

select * from t2;

select * from t1 ORDER BY a;

select * from t2 ORDER BY b;

connection master;

drop table t1;

drop table t2;
@@ -71,7 +74,7 @@ connection master; 
SET TIMESTAMP=1000000000;

CREATE TABLE t1 ( a INT UNIQUE );

SET FOREIGN_KEY_CHECKS=0;

--error 1062

--error 1022, 1062

INSERT INTO t1 VALUES (1),(1);

sync_slave_with_master;

mysql-test/extra/rpl_tests/rpl_row_001.test

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL); 
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval 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;



#

# Test slave with wrong password
@@ -30,7 +30,7 @@ sleep 2; 
CREATE TABLE t3(n INT);

INSERT INTO t3 VALUES(1),(2);

sync_slave_with_master;

SELECT * FROM t3;

SELECT * FROM t3 ORDER BY n;

SELECT SUM(LENGTH(word)) FROM t1;

connection master;

DROP TABLE t1,t3;

mysql-test/r/rpl_insert_id.result

+11 −11
Original line number Diff line number Diff line
@@ -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

mysql-test/r/rpl_ndb_log.result

+8 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/r/rpl_row_001.result

+9 −9
Original line number Diff line number Diff line
@@ -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