summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorpem@mysql.com <>2003-01-09 18:30:58 +0100
committerpem@mysql.com <>2003-01-09 18:30:58 +0100
commitb88ef166563742202f97974db8137d5cefa50b3b (patch)
tree629540dbb135818eb8d03deca79c1676bc0acdae /mysql-test/r
parent1604bea5b759b0351ec0545cde19237fc8454972 (diff)
downloadmariadb-git-b88ef166563742202f97974db8137d5cefa50b3b.tar.gz
Post-merge fix.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/rpl_temporary.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result
index 470a6302a2b..f2da93b0e70 100644
--- a/mysql-test/r/rpl_temporary.result
+++ b/mysql-test/r/rpl_temporary.result
@@ -22,7 +22,7 @@ f
7
show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.000001 4 Start 1 4 Server ver: 4.1.0-alpha-debug-log, Binlog ver: 3
+master-bin.000001 4 Start 1 4 Server ver: 5.0.0-alpha-debug-log, Binlog ver: 3
master-bin.000001 79 Query 1 79 use `test`; create table t1(f int)
master-bin.000001 136 Query 1 136 use `test`; create table t2(f int)
master-bin.000001 193 Query 1 193 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)