diff options
| author | Mats Kindahl <mats@sun.com> | 2008-10-24 14:51:06 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2008-10-24 14:51:06 +0200 |
| commit | 533cf7950ecdccf37d5a603ab769b2dcb986f8c8 (patch) | |
| tree | 6c8cb729e4c0debe7dc6808d5c65f9598814f2a8 /mysql-test/suite/binlog | |
| parent | 1f29c525818b421bda822550a92cb6f7092dcec8 (diff) | |
| download | mariadb-git-533cf7950ecdccf37d5a603ab769b2dcb986f8c8.tar.gz | |
Manual merge of 5.1 into 5.1-rpl
Diffstat (limited to 'mysql-test/suite/binlog')
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_multi_engine.result | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result index 281e8785a8d..caae5f55d13 100644 --- a/mysql-test/suite/binlog/r/binlog_multi_engine.result +++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result @@ -73,19 +73,19 @@ UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c; ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically since more than one engine involved and at least one engine is self-logging show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1m) -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 # Table_map # # table_id: # (test.t1b) -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1n) -master-bin.000001 # Table_map # # table_id: # (mysql.ndb_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 +mysqld-bin.000001 # Query # # use `test`; BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1m) +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # use `test`; COMMIT +mysqld-bin.000001 # Query # # use `test`; BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1b) +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # use `test`; COMMIT +mysqld-bin.000001 # Query # # BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1n) +mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows # # table_id: # +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # COMMIT RESET MASTER; DROP TABLE t1m, t1b, t1n; |