summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_log.result
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-06-22 08:35:18 -0600
committerunknown <sasha@mysql.sashanet.com>2001-06-22 08:35:18 -0600
commitd26e8c39448492e40d70c8179c59ed38a54dc387 (patch)
tree67b81d44bdfef378a12441ec7fee0eb5fc7c93b5 /mysql-test/r/rpl_log.result
parentd310ce76991a8729b575b7c1404e97d2619d7739 (diff)
downloadmariadb-git-d26e8c39448492e40d70c8179c59ed38a54dc387.tar.gz
merged new 3.23 errors
fixed bugs in log seq - now starting to look good fixes for SHOW BINLOG EVENTS will push this one include/mysqld_error.h: merged errors from 3.23 mysql-test/mysql-test-run.sh: wrong quotes in --skip-test mysql-test/r/drop.result: updated test mysql-test/r/rpl_log.result: updated test mysql-test/t/drop.test: updated test mysql-test/t/rpl_log.test: fixed bugs in test case sql/item_sum.h: remove compiler warning about re-ordered initialization sql/log.cc: fixed a bunch of loq_seq bugs sql/log_event.cc: fixed log seq bugs, added info for Slave event in SHOW BINLOG EVENTS sql/share/czech/errmsg.txt: merged errors from 3.23 sql/share/danish/errmsg.txt: merged errors from 3.23 sql/share/dutch/errmsg.txt: merged errors from 3.23 sql/share/english/errmsg.txt: merged errors from 3.23 sql/share/estonian/errmsg.txt: merged errors from 3.23 sql/share/french/errmsg.txt: merged errors from 3.23 sql/share/german/errmsg.txt: merged errors from 3.23 sql/share/greek/errmsg.txt: merged errors from 3.23 sql/share/hungarian/errmsg.txt: merged errors from 3.23 sql/share/italian/errmsg.txt: merged errors from 3.23 sql/share/japanese/errmsg.txt: merged errors from 3.23 sql/share/korean/errmsg.txt: merged errors from 3.23 sql/share/norwegian-ny/errmsg.txt: merged errors from 3.23 sql/share/norwegian/errmsg.txt: merged errors from 3.23 sql/share/polish/errmsg.txt: merged errors from 3.23 sql/share/portuguese/errmsg.txt: merged errors from 3.23 sql/share/romanian/errmsg.txt: merged errors from 3.23 sql/share/russian/errmsg.txt: merged errors from 3.23 sql/share/slovak/errmsg.txt: merged errors from 3.23 sql/share/spanish/errmsg.txt: merged errors from 3.23 sql/share/swedish/errmsg.txt: merged errors from 3.23 sql/slave.cc: fixed log_seq bugs
Diffstat (limited to 'mysql-test/r/rpl_log.result')
-rw-r--r--mysql-test/r/rpl_log.result28
1 files changed, 13 insertions, 15 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index c6345b6b9fb..35c0c63e207 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -28,24 +28,22 @@ master-bin.001 549 Stop 1 10
Log_name Pos Event_type Server_id Log_seq Info
master-bin.002 4 Start 1 1 Server ver: 4.0.0-debug-log, Binlog ver: 2
Log_name
+master-bin.001
+master-bin.002
+Log_name
slave-bin.001
slave-bin.002
-slave-bin.003
-slave-bin.004
Log_name Pos Event_type Server_id Log_seq Info
slave-bin.001 4 Start 2 1 Server ver: 4.0.0-debug-log, Binlog ver: 2
-slave-bin.001 79 Slave 2 2
-slave-bin.001 118 Rotate 2 3 slave-bin.002
-slave-bin.001 150 Stop 2 4
+slave-bin.001 79 Slave 2 2 host=127.0.0.1,port=9306,log=master-bin.001,pos=4
+slave-bin.001 132 Query 1 2 use test; create table t1(n int not null auto_increment primary key)
+slave-bin.001 225 Intvar 1 3 INSERT_ID=1
+slave-bin.001 253 Query 1 4 use test; insert into t1 values (NULL)
+slave-bin.001 316 Query 1 5 use test; drop table t1
+slave-bin.001 364 Query 1 6 use test; create table t1 (word char(20) not null)
+slave-bin.001 439 Query 1 8 use test; drop table t1
+slave-bin.001 487 Rotate 2 3 slave-bin.002
+slave-bin.001 519 Stop 2 4
Log_name Pos Event_type Server_id Log_seq Info
slave-bin.002 4 Start 2 1 Server ver: 4.0.0-debug-log, Binlog ver: 2
-slave-bin.002 79 Slave 1 2
-slave-bin.002 132 Slave 1 3
-slave-bin.002 185 Query 1 4 use test; create table t1(n int not null auto_increment primary key)
-slave-bin.002 278 Intvar 2 5 INSERT_ID=1
-slave-bin.002 306 Query 1 6 use test; insert into t1 values (NULL)
-slave-bin.002 369 Query 1 7 use test; drop table t1
-slave-bin.002 417 Query 1 8 use test; create table t1 (word char(20) not null)
-slave-bin.002 492 Query 1 9 use test; drop table t1
-slave-bin.002 540 Rotate 2 10 slave-bin.003
-slave-bin.002 572 Stop 2 11
+slave-bin.002 79 Slave 2 2 host=127.0.0.1,port=9306,log=master-bin.002,pos=4