Skip to content

M
MariaDB
Commit 6fc3fc8c authored by unknown's avatar unknown
Browse files
Options

Update name of binlog file for ndb_binlog* tests 


mysql-test/include/default_mysqld.cnf:
  Turn on log-bin by default for all mysqlds
mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_discover.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_format.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_log_bin.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_multi.result:
  Update name of binlog file
mysql-test/suite/ndb/t/ndb_binlog_discover.test:
  Update name of binlog file
parent f64c528b
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 159 deletions
mysql-test/include/default_mysqld.cnf
View file @ 6fc3fc8c
...@@ -16,3 +16,6 @@ max_heap_table_size= 1M ...@@ -16,3 +16,6 @@ max_heap_table_size= 1M
loose-innodb_data_file_path= ibdata1:10M:autoextend loose-innodb_data_file_path= ibdata1:10M:autoextend
set-variable= slave_net_timeout=120 set-variable= slave_net_timeout=120
log-bin
mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
View file @ 6fc3fc8c
...@@ -10,32 +10,32 @@ create table t1 (a int primary key) engine=ndb; ...@@ -10,32 +10,32 @@ create table t1 (a int primary key) engine=ndb;
create table t2 (a int primary key) engine=ndb; create table t2 (a int primary key) engine=ndb;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 1 # create database mysqltest mysqld-bin.000001 # Query 1 # create database mysqltest
master-bin1.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb
master-bin1.000001 # Query 102 # use `test`; create table t2 (a int primary key) engine=ndb mysqld-bin.000001 # Query 2 # use `test`; create table t2 (a int primary key) engine=ndb
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # create database mysqltest mysqld-bin.000001 # Query 1 # create database mysqltest
master-bin.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb
master-bin.000001 # Query 102 # use `test`; create table t2 (a int primary key) engine=ndb mysqld-bin.000001 # Query 2 # use `test`; create table t2 (a int primary key) engine=ndb
reset master; reset master;
reset master; reset master;
alter table t2 add column (b int); alter table t2 add column (b int);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 102 # use `test`; alter table t2 add column (b int) mysqld-bin.000001 # Query 2 # use `test`; alter table t2 add column (b int)
reset master; reset master;
reset master; reset master;
ALTER DATABASE mysqltest CHARACTER SET latin1; ALTER DATABASE mysqltest CHARACTER SET latin1;
drop table mysqltest.t1; drop table mysqltest.t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 102 # ALTER DATABASE mysqltest CHARACTER SET latin1 mysqld-bin.000001 # Query 2 # ALTER DATABASE mysqltest CHARACTER SET latin1
master-bin.000001 # Query 102 # use `mysqltest`; drop table `t1` mysqld-bin.000001 # Query 2 # use `mysqltest`; drop table `t1`
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 102 # ALTER DATABASE mysqltest CHARACTER SET latin1 mysqld-bin.000001 # Query 2 # ALTER DATABASE mysqltest CHARACTER SET latin1
master-bin.000001 # Query 102 # use `mysqltest`; drop table `t1` mysqld-bin.000001 # Query 2 # use `mysqltest`; drop table `t1`
reset master; reset master;
reset master; reset master;
use test; use test;
...@@ -44,14 +44,14 @@ drop database mysqltest; ...@@ -44,14 +44,14 @@ drop database mysqltest;
create table t1 (a int primary key) engine=ndb; create table t1 (a int primary key) engine=ndb;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (test.t2) mysqld-bin.000001 # Table_map 2 # table_id: # (test.t2)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
master-bin1.000001 # Query 1 # drop database mysqltest mysqld-bin.000001 # Query 1 # drop database mysqltest
master-bin1.000001 # Query 1 # use `test`; create table t1 (a int primary key) engine=ndb mysqld-bin.000001 # Query 1 # use `test`; create table t1 (a int primary key) engine=ndb
drop table t2; drop table t2;
reset master; reset master;
reset master; reset master;
...@@ -85,63 +85,63 @@ DROP LOGFILE GROUP lg1 ...@@ -85,63 +85,63 @@ DROP LOGFILE GROUP lg1
ENGINE =NDB; ENGINE =NDB;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 1 # CREATE LOGFILE GROUP lg1 mysqld-bin.000001 # Query 1 # CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat' ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M UNDO_BUFFER_SIZE = 1M
ENGINE=NDB ENGINE=NDB
master-bin1.000001 # Query 1 # ALTER LOGFILE GROUP lg1 mysqld-bin.000001 # Query 1 # ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat' ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M INITIAL_SIZE = 4M
ENGINE=NDB ENGINE=NDB
master-bin1.000001 # Query 1 # CREATE TABLESPACE ts1 mysqld-bin.000001 # Query 1 # CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat' ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1 USE LOGFILE GROUP lg1
INITIAL_SIZE 12M INITIAL_SIZE 12M
ENGINE NDB ENGINE NDB
master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1
ADD DATAFILE 'datafile02.dat' ADD DATAFILE 'datafile02.dat'
INITIAL_SIZE = 4M INITIAL_SIZE = 4M
ENGINE=NDB ENGINE=NDB
master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' DROP DATAFILE 'datafile.dat'
ENGINE = NDB ENGINE = NDB
master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1
DROP DATAFILE 'datafile02.dat' DROP DATAFILE 'datafile02.dat'
ENGINE = NDB ENGINE = NDB
master-bin1.000001 # Query 1 # DROP TABLESPACE ts1 mysqld-bin.000001 # Query 1 # DROP TABLESPACE ts1
ENGINE = NDB ENGINE = NDB
master-bin1.000001 # Query 1 # DROP LOGFILE GROUP lg1 mysqld-bin.000001 # Query 1 # DROP LOGFILE GROUP lg1
ENGINE =NDB ENGINE =NDB
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 1 # CREATE LOGFILE GROUP lg1 mysqld-bin.000001 # Query 1 # CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat' ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M UNDO_BUFFER_SIZE = 1M
ENGINE=NDB ENGINE=NDB
master-bin1.000001 # Query 1 # ALTER LOGFILE GROUP lg1 mysqld-bin.000001 # Query 1 # ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat' ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M INITIAL_SIZE = 4M
ENGINE=NDB ENGINE=NDB
master-bin1.000001 # Query 1 # CREATE TABLESPACE ts1 mysqld-bin.000001 # Query 1 # CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat' ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1 USE LOGFILE GROUP lg1
INITIAL_SIZE 12M INITIAL_SIZE 12M
ENGINE NDB ENGINE NDB
master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1
ADD DATAFILE 'datafile02.dat' ADD DATAFILE 'datafile02.dat'
INITIAL_SIZE = 4M INITIAL_SIZE = 4M
ENGINE=NDB ENGINE=NDB
master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' DROP DATAFILE 'datafile.dat'
ENGINE = NDB ENGINE = NDB
master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1
DROP DATAFILE 'datafile02.dat' DROP DATAFILE 'datafile02.dat'
ENGINE = NDB ENGINE = NDB
master-bin1.000001 # Query 1 # DROP TABLESPACE ts1 mysqld-bin.000001 # Query 1 # DROP TABLESPACE ts1
ENGINE = NDB ENGINE = NDB
master-bin1.000001 # Query 1 # DROP LOGFILE GROUP lg1 mysqld-bin.000001 # Query 1 # DROP LOGFILE GROUP lg1
ENGINE =NDB ENGINE =NDB
drop table t1; drop table t1;
reset master; reset master;
...@@ -156,13 +156,13 @@ create table t3 (a int key) engine=ndb; ...@@ -156,13 +156,13 @@ create table t3 (a int key) engine=ndb;
rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb mysqld-bin.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb
master-bin1.000001 # Query 1 # use `test`; create table t2 (a int key) engine=ndb mysqld-bin.000001 # Query 1 # use `test`; create table t2 (a int key) engine=ndb
master-bin1.000001 # Query 1 # use `test`; create table t3 (a int key) engine=ndb mysqld-bin.000001 # Query 1 # use `test`; create table t3 (a int key) engine=ndb
master-bin1.000001 # Query 1 # use `test`; rename table `test.t3` to `test.t4` mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t3` to `test.t4`
master-bin1.000001 # Query 1 # use `test`; rename table `test.t2` to `test.t3` mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t2` to `test.t3`
master-bin1.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2` mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2`
master-bin1.000001 # Query 1 # use `test`; rename table `test.t4` to `test.t1` mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t4` to `test.t1`
drop table t1; drop table t1;
drop table t2; drop table t2;
drop table t3; drop table t3;
...@@ -179,18 +179,18 @@ insert into t2 values(2); ...@@ -179,18 +179,18 @@ insert into t2 values(2);
drop table t2; drop table t2;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb mysqld-bin.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (test.t1) mysqld-bin.000001 # Table_map 2 # table_id: # (test.t1)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
master-bin1.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2` mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2`
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (test.t2) mysqld-bin.000001 # Table_map 2 # table_id: # (test.t2)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
master-bin1.000001 # Query 102 # use `test`; drop table t2 mysqld-bin.000001 # Query 2 # use `test`; drop table t2
mysql-test/suite/ndb/r/ndb_binlog_discover.result
View file @ 6fc3fc8c
...@@ -3,15 +3,15 @@ create table t1 (a int key) engine=ndb; ...@@ -3,15 +3,15 @@ create table t1 (a int key) engine=ndb;
reset master; reset master;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Incident 1 # #1 (LOST_EVENTS) mysqld-bin.000001 # Incident 1 # #1 (LOST_EVENTS)
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 mysqld-bin.000001 # Rotate 1 # mysqld-bin.000002;pos=4
PURGE MASTER LOGS TO 'master-bin.000002'; PURGE MASTER LOGS TO 'mysqld-bin.000002';
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Query 1 # BEGIN mysqld-bin.000002 # Query 1 # BEGIN
master-bin.000002 # Table_map 1 # table_id: # (test.t1) mysqld-bin.000002 # Table_map 1 # table_id: # (test.t1)
master-bin.000002 # Table_map 1 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000002 # Table_map 1 # table_id: # (mysql.ndb_apply_status)
master-bin.000002 # Write_rows 1 # table_id: # mysqld-bin.000002 # Write_rows 1 # table_id: #
master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F mysqld-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000002 # Query 1 # COMMIT mysqld-bin.000002 # Query 1 # COMMIT
drop table t1; drop table t1;
mysql-test/suite/ndb/r/ndb_binlog_format.result
View file @ 6fc3fc8c
...@@ -14,17 +14,17 @@ UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c; ...@@ -14,17 +14,17 @@ UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c;
COMMIT; COMMIT;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (1,2), (2,1), (2,2) mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (1,2), (2,1), (2,2)
master-bin.000001 # Query # # use `test`; INSERT INTO t2 VALUES (1,1), (1,2), (2,1), (2,2) mysqld-bin.000001 # Query # # use `test`; INSERT INTO t2 VALUES (1,1), (1,2), (2,1), (2,2)
master-bin.000001 # Query # # use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c mysqld-bin.000001 # Query # # use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c
master-bin.000001 # Query # # use `test`; BEGIN mysqld-bin.000001 # Query # # use `test`; BEGIN
master-bin.000001 # Query # # use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2) mysqld-bin.000001 # Query # # use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2)
master-bin.000001 # Query # # use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f mysqld-bin.000001 # Query # # use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f
master-bin.000001 # Query # # use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c mysqld-bin.000001 # Query # # use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c
master-bin.000001 # Query # # use `test`; COMMIT mysqld-bin.000001 # Query # # use `test`; COMMIT
master-bin.000001 # Query # # BEGIN mysqld-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t3) mysqld-bin.000001 # Table_map # # table_id: # (test.t3)
master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT mysqld-bin.000001 # Query # # COMMIT
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result
View file @ 6fc3fc8c
...@@ -7,5 +7,5 @@ create table t1 (a int primary key, b int) engine=ndb; ...@@ -7,5 +7,5 @@ create table t1 (a int primary key, b int) engine=ndb;
insert into t1 values (1, 1); insert into t1 values (1, 1);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; drop table if exists t1 mysqld-bin.000001 # Query 1 # use `test`; drop table if exists t1
drop database mysqltest; drop database mysqltest;
mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
View file @ 6fc3fc8c
...@@ -11,27 +11,27 @@ insert into t1 values (1,1); ...@@ -11,27 +11,27 @@ insert into t1 values (1,1);
alter table t1 add c int; alter table t1 add c int;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # BEGIN mysqld-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1) mysqld-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1)
master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT mysqld-bin.000001 # Query 1 # COMMIT
reset master; reset master;
use mysqltest; use mysqltest;
insert into t2 values (1,1); insert into t2 values (1,1);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t1) mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t1)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t2) mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t2)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
reset master; reset master;
use mysqltest; use mysqltest;
drop table t1; drop table t1;
...@@ -41,40 +41,40 @@ create table t2 (d int key, e int) engine=ndb; ...@@ -41,40 +41,40 @@ create table t2 (d int key, e int) engine=ndb;
insert into t1 values (1,1); insert into t1 values (1,1);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # BEGIN mysqld-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # table_id: # (mysqltest.t2) mysqld-bin.000001 # Table_map 1 # table_id: # (mysqltest.t2)
master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status)
master-bin.000001 # Write_rows 1 # table_id: # mysqld-bin.000001 # Write_rows 1 # table_id: #
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT mysqld-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `mysqltest`; drop table t1 mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table t1
master-bin.000001 # Query 1 # use `mysqltest`; drop table t2 mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table t2
master-bin.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb
master-bin.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb
master-bin.000001 # Query 1 # BEGIN mysqld-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1) mysqld-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1)
master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status)
master-bin.000001 # Write_rows 1 # table_id: # mysqld-bin.000001 # Write_rows 1 # table_id: #
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT mysqld-bin.000001 # Query 1 # COMMIT
use mysqltest; use mysqltest;
insert into t2 values (1,1); insert into t2 values (1,1);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 1 # use `mysqltest`; drop table `t1` mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table `t1`
master-bin1.000001 # Query 1 # use `mysqltest`; drop table `t2` mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table `t2`
master-bin1.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb
master-bin1.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t1) mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t1)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t2) mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t2)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
drop database mysqltest; drop database mysqltest;
mysql-test/suite/ndb/r/ndb_binlog_multi.result
View file @ 6fc3fc8c
...@@ -8,13 +8,13 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB; ...@@ -8,13 +8,13 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB;
INSERT INTO t2 VALUES (1,1),(2,2); INSERT INTO t2 VALUES (1,1),(2,2);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 102 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (test.t2) mysqld-bin.000001 # Table_map 2 # table_id: # (test.t2)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
select * from t2 order by a; select * from t2 order by a;
a b a b
1 1 1 1
...@@ -30,14 +30,14 @@ a b ...@@ -30,14 +30,14 @@ a b
DROP TABLE t2; DROP TABLE t2;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 102 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB
master-bin.000001 # Query 1 # BEGIN mysqld-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # table_id: # (test.t2) mysqld-bin.000001 # Table_map 1 # table_id: # (test.t2)
master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status)
master-bin.000001 # Write_rows 1 # table_id: # mysqld-bin.000001 # Write_rows 1 # table_id: #
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT mysqld-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; DROP TABLE t2 mysqld-bin.000001 # Query 1 # use `test`; DROP TABLE t2
SELECT inserts,updates,deletes,schemaops FROM SELECT inserts,updates,deletes,schemaops FROM
mysql.ndb_binlog_index WHERE epoch=<the_epoch>; mysql.ndb_binlog_index WHERE epoch=<the_epoch>;
inserts updates deletes schemaops inserts updates deletes schemaops
...@@ -48,13 +48,13 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB; ...@@ -48,13 +48,13 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB;
INSERT INTO t1 VALUES (1),(2); INSERT INTO t1 VALUES (1),(2);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 102 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (test.t1) mysqld-bin.000001 # Table_map 2 # table_id: # (test.t1)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM
mysql.ndb_binlog_index ORDER BY epoch DESC LIMIT 1; mysql.ndb_binlog_index ORDER BY epoch DESC LIMIT 1;
@the_epoch2:=epoch inserts updates deletes schemaops @the_epoch2:=epoch inserts updates deletes schemaops
...@@ -66,14 +66,14 @@ inserts updates deletes schemaops ...@@ -66,14 +66,14 @@ inserts updates deletes schemaops
drop table t1; drop table t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin1.000001 # Query 102 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB
master-bin1.000001 # Query 102 # BEGIN mysqld-bin.000001 # Query 2 # BEGIN
master-bin1.000001 # Table_map 102 # table_id: # (test.t1) mysqld-bin.000001 # Table_map 2 # table_id: # (test.t1)
master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status)
master-bin1.000001 # Write_rows 102 # table_id: # mysqld-bin.000001 # Write_rows 2 # table_id: #
master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin1.000001 # Query 102 # COMMIT mysqld-bin.000001 # Query 2 # COMMIT
master-bin1.000001 # Query 102 # use `test`; drop table t1 mysqld-bin.000001 # Query 2 # use `test`; drop table t1
SELECT inserts,updates,deletes,schemaops FROM SELECT inserts,updates,deletes,schemaops FROM
mysql.ndb_binlog_index WHERE epoch > <the_epoch> AND epoch <= <the_epoch2>; mysql.ndb_binlog_index WHERE epoch > <the_epoch> AND epoch <= <the_epoch2>;
inserts updates deletes schemaops inserts updates deletes schemaops
......
mysql-test/suite/ndb/t/ndb_binlog_discover.test
View file @ 6fc3fc8c
...@@ -30,7 +30,7 @@ while ($mysql_errno) ...@@ -30,7 +30,7 @@ while ($mysql_errno)
--enable_query_log --enable_query_log
--source include/show_binlog_events2.inc --source include/show_binlog_events2.inc
PURGE MASTER LOGS TO 'master-bin.000002'; PURGE MASTER LOGS TO 'mysqld-bin.000002';
--source include/show_binlog_events2.inc --source include/show_binlog_events2.inc
drop table t1; drop table t1;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7