summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-11-19 12:03:30 -0700
committersasha@mysql.sashanet.com <>2001-11-19 12:03:30 -0700
commit2b17a22a6b68c2fefbd268a3add7914d1c3dac37 (patch)
treee7163e7aa63728c66339d8fbae1e6687f23656b9 /mysql-test
parent773ed93755e455ffbbb70249ad84019a7b7ed2dd (diff)
downloadmariadb-git-2b17a22a6b68c2fefbd268a3add7914d1c3dac37.tar.gz
fixed problem in rpl_log test
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/fix-result2
-rw-r--r--mysql-test/r/rpl_log.result6
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/fix-result b/mysql-test/fix-result
index 8e6f574d7c2..bd380332ff5 100755
--- a/mysql-test/fix-result
+++ b/mysql-test/fix-result
@@ -7,7 +7,7 @@
#It is assumed we are running the script in mysql-test directory
-VERSION=4.0.0-alpha-debug-log
+VERSION=4.0.1-alpha-debug-log
TEST_CASE=$1
if [ -z "$TEST_CASE" ] ;
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 43108b880b4..27a19f49874 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -16,7 +16,7 @@ load data infile '../../std_data/words.dat' into table t1;
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id Log_seq Info
-master-bin.001 4 Start 1 1 Server ver: 4.0.1-alpha-debug-log, Binlog ver: 2
+master-bin.001 4 Start 1 1 Server ver: $VERSION, Binlog ver: 2
master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key)
master-bin.001 172 Intvar 1 3 INSERT_ID=1
master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL)
@@ -41,7 +41,7 @@ insert into t1 values (1);
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id Log_seq Info
-master-bin.001 4 Start 1 1 Server ver: 4.0.1-alpha-debug-log, Binlog ver: 2
+master-bin.001 4 Start 1 1 Server ver: $VERSION, Binlog ver: 2
master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key)
master-bin.001 172 Intvar 1 3 INSERT_ID=1
master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL)
@@ -68,7 +68,7 @@ slave-bin.001
slave-bin.002
show binlog events in 'slave-bin.001' from 4;
Log_name Pos Event_type Server_id Log_seq Info
-slave-bin.001 4 Start 2 1 Server ver: 4.0.1-alpha-debug-log, Binlog ver: 2
+slave-bin.001 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2
slave-bin.001 79 Slave 2 3 host=127.0.0.1,port=$MASTER_MYPORT,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