summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <dlenev@dlenev.mshome>2003-09-16 02:58:46 +0400
committerunknown <dlenev@dlenev.mshome>2003-09-16 02:58:46 +0400
commitbf9c210fce5d5ae2b89dc1ba9beb86a9ead6c2a1 (patch)
tree6d2dccac4194e4bf23f23432998e529d1536fd70 /mysql-test
parentd5877319aff5afdf49115d1f2e5b8a9ab912d82d (diff)
downloadmariadb-git-bf9c210fce5d5ae2b89dc1ba9beb86a9ead6c2a1.tar.gz
Made rpl_until test independent from mysqld version
mysql-test/r/rpl_until.result: Made test indepdendent from mysqld version mysql-test/t/rpl_until.test: Made test indepdendent from mysqld version
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_until.result2
-rw-r--r--mysql-test/t/rpl_until.test4
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_until.result b/mysql-test/r/rpl_until.result
index 1c357479fb7..a6b2908b0a5 100644
--- a/mysql-test/r/rpl_until.result
+++ b/mysql-test/r/rpl_until.result
@@ -14,7 +14,7 @@ insert into t2 values (3),(4);
drop table t2;
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.1-alpha-debug-log, Binlog ver: 3
+master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
master-bin.000001 172 Query 1 172 use `test`; insert into t1 values (1),(2),(3),(4)
master-bin.000001 244 Query 1 244 use `test`; drop table t1
diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test
index 8845cf205a9..0c9ff03b5bd 100644
--- a/mysql-test/t/rpl_until.test
+++ b/mysql-test/t/rpl_until.test
@@ -1,5 +1,8 @@
source include/master-slave.inc;
+# prepare version for substitutions
+let $VERSION=`select version()`;
+
# stop slave before he will start replication
connection slave;
stop slave;
@@ -13,6 +16,7 @@ create table t2(n int not null auto_increment primary key);
insert into t2 values (1),(2);
insert into t2 values (3),(4);
drop table t2;
+--replace_result $VERSION VERSION
show binlog events;
# try to replicate all queries until drop of t1