diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
| commit | c58d9d9a9dda3037db574bbf97b22e7c1c274e02 (patch) | |
| tree | 54ccfe80d1405cb4325209020ea3c34d86a60770 /mysql-test/r/rpl_log.result | |
| parent | 33fc0d53b543032accea2476a4eed0522cead2bb (diff) | |
| download | mariadb-git-c58d9d9a9dda3037db574bbf97b22e7c1c274e02.tar.gz | |
Fixes after merge with 4.0
mysql-test/r/heap_btree.result:
Updated results
mysql-test/r/heap_hash.result:
Updated results
mysql-test/r/merge.result:
Updated results
mysql-test/r/rpl_log.result:
Updated results
mysql-test/r/select.result:
Updated results
mysql-test/r/subselect.result:
Updated results
sql/item_cmpfunc.h:
Fix after merge
sql/log_event.cc:
Fix after merge
sql/mysql_priv.h:
Fix after merge
sql/sql_acl.cc:
Fix after merge
sql/sql_class.cc:
Fix after merge
sql/sql_db.cc:
Fix after merge
sql/sql_delete.cc:
Fix after merge
sql/sql_lex.cc:
Fix after merge
sql/sql_lex.h:
Fix after merge
sql/sql_parse.cc:
Fix after merge
sql/sql_update.cc:
Fix after merge
sql/sql_yacc.yy:
Fix after merge
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index a5850cbd181..ed54eb75f4b 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -72,7 +72,7 @@ show binlog events in 'slave-bin.000001' from 4; 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 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) -slave-bin.000001 172 Intvar 1 200 INSERT_ID=1 +slave-bin.000001 172 Intvar 1 172 INSERT_ID=1 slave-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL) slave-bin.000001 263 Query 1 263 use `test`; drop table t1 slave-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) |