Commit a4f610f5 authored by unknown's avatar unknown
Browse files

wl#3023 clean up 

- enabling some new tests
parent c2db8a7f

mysql-test/r/ndb_binlog_ddl_multi.result

+12 −12
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ create table t1 (a int primary key) engine=ndb; 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Table_map	#	#	test.t2

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Table_map	#	#	table_id: # (test.t2)

master-bin1.000001	#	Table_map	#	#	table_id: # (cluster.apply_status)

master-bin1.000001	#	Write_rows	#	#	table_id: #

master-bin1.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	drop database mysqltest

master-bin1.000001	#	Query	#	#	use `test`; create table t1 (a int primary key) engine=ndb
@@ -148,16 +148,16 @@ show binlog events from <binlog_start>; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	use `test`; create table t1 (a int key) engine=ndb

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Table_map	#	#	test.t1

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin1.000001	#	Table_map	#	#	table_id: # (cluster.apply_status)

master-bin1.000001	#	Write_rows	#	#	table_id: #

master-bin1.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; rename table `test.t1` to `test.t2`

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Table_map	#	#	test.t2

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Table_map	#	#	table_id: # (test.t2)

master-bin1.000001	#	Table_map	#	#	table_id: # (cluster.apply_status)

master-bin1.000001	#	Write_rows	#	#	table_id: #

master-bin1.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; drop table `t2`

mysql-test/r/ndb_binlog_ignore_db.result

+0 −2
Original line number Diff line number Diff line
@@ -9,6 +9,4 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	#	Query	#	#	use `test`; drop table if exists t1

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

drop database mysqltest;

mysql-test/r/rpl_ndb_charset.result

+0 −10
Original line number Diff line number Diff line
@@ -114,20 +114,14 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	#	Query	1	#	drop database if exists mysqltest2

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	drop database if exists mysqltest3

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	create database mysqltest2 character set latin2

master-bin.000001	#	Query	1	#	create database mysqltest3

master-bin.000001	#	Query	1	#	drop database mysqltest3

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	create database mysqltest3

master-bin.000001	#	Query	1	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest2.t1)
@@ -155,13 +149,9 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F 
master-bin.000001	#	Query	1	#	drop database mysqltest2

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	drop database mysqltest3

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

select "--- --global--" as "";



--- --global--

mysql-test/r/rpl_ndb_dd_basic.result

+13 −14
Original line number Diff line number Diff line
@@ -32,36 +32,35 @@ pk1 b c 
select * from t1 order by pk1;

pk1	b	c

1	2	3

show binlog events;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	102	Server ver: VERSION, Binlog ver: 4

master-bin.000001	102	Query	1	188	use `test`; DROP TABLE IF EXISTS t1

master-bin.000001	188	Query	1	353	CREATE LOGFILE GROUP lg1

master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS t1

master-bin.000001	#	Query	#	#	CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=NDB

master-bin.000001	353	Query	1	496	alter logfile group lg1

master-bin.000001	#	Query	#	#	alter logfile group lg1

add undofile 'undofile02.dat'

initial_size 4M engine=ndb

master-bin.000001	496	Query	1	658	CREATE TABLESPACE ts1

master-bin.000001	#	Query	#	#	CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M

ENGINE NDB

master-bin.000001	658	Query	1	798	alter tablespace ts1

master-bin.000001	#	Query	#	#	alter tablespace ts1

add datafile 'datafile02.dat'

initial_size 4M engine=ndb

master-bin.000001	798	Query	1	978	use `test`; CREATE TABLE t1

master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1

(pk1 int not null primary key, b int not null, c int not null)

tablespace ts1 storage disk

engine ndb

master-bin.000001	978	Query	1	1042	BEGIN

master-bin.000001	1042	Table_map	1	41	table_id: # (test.t1)

master-bin.000001	1083	Table_map	1	94	table_id: # (cluster.apply_status)

master-bin.000001	1136	Write_rows	1	136	table_id: #

master-bin.000001	1178	Write_rows	1	178	table_id: # flags: STMT_END_F

master-bin.000001	1220	Query	1	1285	COMMIT

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	#	#	table_id: # (cluster.apply_status)

master-bin.000001	#	Write_rows	#	#	table_id: #

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	COMMIT

drop table t1;

alter tablespace ts1

drop datafile 'datafile.dat'

mysql-test/r/rpl_ndb_log.result

+33 −33
Original line number Diff line number Diff line
@@ -21,18 +21,18 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4

master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB

master-bin.000001	#	Query	1	#	BEGIN

master-bin.000001	#	Table_map	1	#	cluster.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	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	1	#	table_id: # (cluster.apply_status)

master-bin.000001	#	Write_rows	1	#	table_id: #

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	COMMIT

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB

master-bin.000001	#	Query	1	#	BEGIN

master-bin.000001	#	Table_map	1	#	cluster.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	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	1	#	table_id: # (cluster.apply_status)

master-bin.000001	#	Write_rows	1	#	table_id: #

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	COMMIT

show binlog events from 102 limit 1;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -43,7 +43,7 @@ master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_in 
master-bin.000001	#	Query	1	#	BEGIN

show binlog events from 102 limit 2,1;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Table_map	1	#	cluster.apply_status

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

flush logs;

create table t3 (a int)ENGINE=NDB;

start slave;
@@ -56,18 +56,18 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4

master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB

master-bin.000001	#	Query	1	#	BEGIN

master-bin.000001	#	Table_map	1	#	cluster.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	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	1	#	table_id: # (cluster.apply_status)

master-bin.000001	#	Write_rows	1	#	table_id: #

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	COMMIT

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB

master-bin.000001	#	Query	1	#	BEGIN

master-bin.000001	#	Table_map	1	#	cluster.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	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	1	#	table_id: # (cluster.apply_status)

master-bin.000001	#	Write_rows	1	#	table_id: #

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	COMMIT

master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4

show binlog events in 'master-bin.000002';
@@ -76,10 +76,10 @@ master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 
master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB

master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB

master-bin.000002	#	Query	1	#	BEGIN

master-bin.000002	#	Table_map	1	#	cluster.apply_status

master-bin.000002	#	Write_rows	1	#	

master-bin.000002	#	Table_map	1	#	test.t2

master-bin.000002	#	Write_rows	1	#	

master-bin.000002	#	Table_map	1	#	table_id: # (test.t2)

master-bin.000002	#	Table_map	1	#	table_id: # (cluster.apply_status)

master-bin.000002	#	Write_rows	1	#	table_id: #

master-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000002	#	Query	1	#	COMMIT

show binary logs;

Log_name	File_size
@@ -95,18 +95,18 @@ Log_name Pos Event_type Server_id End_log_pos Info 
slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Table_map	2	#	cluster.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	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (cluster.apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F

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 t1 (word char(20) not null)ENGINE=NDB

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Table_map	2	#	cluster.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	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (cluster.apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F

slave-bin.000001	#	Query	2	#	COMMIT

slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB

slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
@@ -115,10 +115,10 @@ Log_name Pos Event_type Server_id End_log_pos Info 
slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB

slave-bin.000002	#	Query	2	#	BEGIN

slave-bin.000002	#	Table_map	2	#	cluster.apply_status

slave-bin.000002	#	Write_rows	2	#	

slave-bin.000002	#	Table_map	2	#	test.t2

slave-bin.000002	#	Write_rows	2	#	

slave-bin.000002	#	Table_map	2	#	table_id: # (test.t2)

slave-bin.000002	#	Table_map	2	#	table_id: # (cluster.apply_status)

slave-bin.000002	#	Write_rows	2	#	table_id: #

slave-bin.000002	#	Write_rows	2	#	table_id: # flags: STMT_END_F

slave-bin.000002	#	Query	2	#	COMMIT

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master