diff options
| author | unknown <tomas@poseidon.bredbandsbolaget.se> | 2008-02-14 00:02:25 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.bredbandsbolaget.se> | 2008-02-14 00:02:25 +0100 |
| commit | 24fdba78be51c16085bfc4be83d56ffde5d3a04c (patch) | |
| tree | 3822411a02fce6eb9c961d3c7619989a1582b951 /mysql-test/suite/rpl_ndb | |
| parent | 9ab7ecc43a1ade0a7138edcc06e09aa70d55269e (diff) | |
| download | mariadb-git-24fdba78be51c16085bfc4be83d56ffde5d3a04c.tar.gz | |
correct merge error
Diffstat (limited to 'mysql-test/suite/rpl_ndb')
| -rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
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 7d8972cfbf2..db9920dd79f 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 @@ -34,7 +34,7 @@ master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN show binlog events from <start_pos> limit 1,1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 396 Query 1 # use `test`; insert into t1 values (1,2) +master-bin.000001 # Query 1 # use `test`; insert into t1 values (1,2) # and the COMMIT should be at <end_pos> |