diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-02 18:58:17 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-02 18:58:17 +0200 |
| commit | a829604260c4a485e74f2d30bbbf5f9619837b70 (patch) | |
| tree | 5558803a46329d136748a32e38c66c6ff19b5b09 /mysql-test/suite/rpl_ndb/r | |
| parent | fe3ea31d9310e14ffce99d23a9b5979864e96fe2 (diff) | |
| parent | 8a2454f8e9fce648272577fcf8006ae6e6806cf9 (diff) | |
| download | mariadb-git-a829604260c4a485e74f2d30bbbf5f9619837b70.tar.gz | |
first merge from main
Diffstat (limited to 'mysql-test/suite/rpl_ndb/r')
| -rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result index 5b6ca5f5097..540c430e757 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result @@ -317,14 +317,14 @@ insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int) -master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Query # # COMMIT +master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT +master-bin.000001 # Query # # COMMIT select * from t1; a b 1 1 diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result index db9920dd79f..675a69d17a4 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result @@ -28,7 +28,7 @@ from mysql.ndb_apply_status; show binlog events from <start_pos> limit 1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN +master-bin.000001 <start_pos> Query 1 # BEGIN # Now the insert, one step after @@ -53,7 +53,7 @@ from mysql.ndb_apply_status; <log_name> <start_pos> <end_pos> show binlog events from <start_pos> limit 1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN +master-bin.000001 <start_pos> Query 1 # BEGIN show binlog events from <start_pos> limit 1,2; Log_name Pos Event_type Server_id End_log_pos Info |