From 6dcd03d76c5eb67a4d6ef8d01393789e45ab1864 Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Wed, 3 Oct 2001 15:19:58 -0600
Subject: post-merge fixes

mysql-test/fix-result:
  version update
mysql-test/r/bigint.result:
  post-merge fix
mysql-test/r/join.result:
  post-merge fix
mysql-test/r/merge.result:
  post-merge fix
mysql-test/r/null_key.result:
  post-merge fix
mysql-test/r/rpl000002.result:
  post-merge fix
mysql-test/r/rpl000015.result:
  post-merge fix
mysql-test/r/rpl000016.result:
  post-merge fix
mysql-test/r/rpl_log.result:
  post-merge fix
mysql-test/r/show_check.result:
  post-merge fix
mysql-test/t/rpl000002.test:
  post-merge fix
mysql-test/t/rpl000015.test:
  post-merge fix
mysql-test/t/rpl000016.test:
  post-merge fix
---
 mysql-test/t/rpl000002.test | 2 +-
 mysql-test/t/rpl000015.test | 1 +
 mysql-test/t/rpl000016.test | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'mysql-test/t')

diff --git a/mysql-test/t/rpl000002.test b/mysql-test/t/rpl000002.test
index 5840b1998a8..420ae27a337 100644
--- a/mysql-test/t/rpl000002.test
+++ b/mysql-test/t/rpl000002.test
@@ -1,4 +1,5 @@
 source include/master-slave.inc;
+eval_result;
 connection master;
 use test;
 drop table if exists t1;
@@ -11,7 +12,6 @@ use test;
 sync_with_master;
 select * from t1;
 connection master;
---replace_result 9307 9999 3350 9999 3351 9999
 show slave hosts;
 drop table t1;
 save_master_pos;
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index 73a10bed7b3..b6397cca7bb 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -1,5 +1,6 @@
 connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0, mysql-slave.sock);
+eval_result;
 connection master;
 reset master;
 show master status;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index bd4ce0f1d31..972f6771292 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -1,5 +1,6 @@
 connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0,mysql-slave.sock);
+eval_result;
 system cat /dev/null > var/slave-data/master.info;
 system chmod 000 var/slave-data/master.info;
 connection slave;
-- 
cgit v1.2.1