diff options
| author | unknown <ramil@mysql.com> | 2006-06-16 14:05:58 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-06-16 14:05:58 +0500 |
| commit | dd285aac1b005866c3d3ae3d1a4e6e890f838d42 (patch) | |
| tree | 34545dbdb997d6fc27eb5dc62836f91bf4cd53a1 /mysql-test/r/rpl_log.result | |
| parent | 4a9985762e6e84889be669e071b0d3ac68a205fa (diff) | |
| download | mariadb-git-dd285aac1b005866c3d3ae3d1a4e6e890f838d42.tar.gz | |
after-merge fixes.
mysql-test/r/rpl_log.result:
after-merge fix.
sql/ha_archive.cc:
after-merge fix.
sql/item_func.cc:
after-merge fix.
sql/sql_class.cc:
after-merge fix.
sql/sql_class.h:
after-merge fix.
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 6a41a9b9e02..6ee0eb283b5 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -107,11 +107,11 @@ reset master; set insert_id=5; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); show binlog events; -Log_name Pos Event_type Server_id Orig_log_pos Info -slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3 -slave-bin.000001 79 Intvar 2 79 LAST_INSERT_ID=1 -slave-bin.000001 107 Intvar 2 107 INSERT_ID=5 -slave-bin.000001 135 Query 2 135 use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()) +Log_name Pos Event_type Server_id End_log_pos Info +slave-bin.000001 4 Format_desc 2 98 Server ver: VERSION, Binlog ver: 4 +slave-bin.000001 98 Intvar 2 126 LAST_INSERT_ID=1 +slave-bin.000001 126 Intvar 2 154 INSERT_ID=5 +slave-bin.000001 154 Query 2 289 use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()) select * from t1; a b 1 1 |