Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new (e89870f1) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ndb_binlog_basic.result

+0 −11

Original line number	Diff line number	Diff line
		@@ -29,12 +29,6 @@ select inserts,updates,deletes from
		cluster.binlog_index where epoch > @max_epoch and updates > 0;
		inserts updates deletes
		2 1 1
		select schemaops from
		cluster.binlog_index where epoch > @max_epoch and schemaops > 0;
		schemaops
		1
		1
		1
		flush logs;
		purge master logs before now();
		select count(*) from cluster.binlog_index;
		@@ -55,8 +49,3 @@ select inserts,updates,deletes from
		cluster.binlog_index where epoch > @max_epoch and inserts > 0;
		inserts updates deletes
		2 0 0
		select schemaops from
		cluster.binlog_index where epoch > @max_epoch and schemaops > 0;
		schemaops
		1
		1

mysql-test/r/ndb_binlog_ddl_multi.result

+14 −41

Original line number	Diff line number	Diff line
		@@ -23,10 +23,6 @@ reset master;
		alter table t2 add column (b int);
		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 # Query # # COMMIT
		master-bin1.000001 # Query # # use `test`; alter table t2 add column (b int)
		reset master;
		reset master;
		@@ -35,10 +31,6 @@ drop table mysqltest.t1;
		show binlog events from <binlog_start>;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 # Query # # ALTER DATABASE mysqltest CHARACTER SET latin1
		master-bin.000001 # Query # # BEGIN
		master-bin.000001 # Table_map # # cluster.apply_status
		master-bin.000001 # Write_rows # #
		master-bin.000001 # Query # # COMMIT
		master-bin.000001 # Query # # use `mysqltest`; drop table `t1`
		reset master;
		reset master;
		@@ -49,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
		@@ -118,10 +110,6 @@ master-bin1.000001 # Query # # DROP TABLESPACE ts1
		ENGINE = NDB
		master-bin1.000001 # Query # # DROP LOGFILE GROUP lg1
		ENGINE =NDB
		master-bin1.000001 # Query # # BEGIN
		master-bin1.000001 # Table_map # # cluster.apply_status
		master-bin1.000001 # Write_rows # #
		master-bin1.000001 # Query # # COMMIT
		master-bin1.000001 # Query # # use `test`; drop table `t1`
		reset master;
		show tables;
		@@ -138,25 +126,9 @@ 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 # # use `test`; create table t2 (a int key) engine=ndb
		master-bin1.000001 # Query # # use `test`; create table t3 (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 # Query # # COMMIT
		master-bin1.000001 # Query # # use `test`; rename table `test.t3` to `test.t4`
		master-bin1.000001 # Query # # BEGIN
		master-bin1.000001 # Table_map # # cluster.apply_status
		master-bin1.000001 # Write_rows # #
		master-bin1.000001 # Query # # COMMIT
		master-bin1.000001 # Query # # use `test`; rename table `test.t2` to `test.t3`
		master-bin1.000001 # Query # # BEGIN
		master-bin1.000001 # Table_map # # cluster.apply_status
		master-bin1.000001 # Write_rows # #
		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 # Query # # COMMIT
		master-bin1.000001 # Query # # use `test`; rename table `test.t4` to `test.t1`
		drop table t1;
		drop table t2;
		@@ -171,20 +143,21 @@ create table t1 (a int key) engine=ndb;
		insert into t1 values(1);
		rename table t1 to t2;
		insert into t2 values(2);
		drop table t2;
		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
		drop table t2;
		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/ndb_binlog_multi.result

+0 −2

Original line number	Diff line number	Diff line
		@@ -33,11 +33,9 @@ cluster.binlog_index ORDER BY epoch DESC LIMIT 1;
		SELECT inserts,updates,deletes,schemaops FROM
		cluster.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;
		inserts updates deletes schemaops
		0 0 0 1
		drop table t1;
		SHOW TABLES;
		Tables_in_test
		SELECT inserts,updates,deletes,schemaops FROM
		cluster.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;
		inserts updates deletes schemaops
		0 0 0 1

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