summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-01-23 19:15:27 +0200
committerAndrei Elkin <aelkin@mysql.com>2009-01-23 19:15:27 +0200
commitdb337eb8d8c2dc6c343b89ac78be8966d14a85fc (patch)
treede3446e8855326e0279735b4bcd06e95323289b5
parent00ca9099e6cf6aa5341a1faed0e2b8dffa267062 (diff)
downloadmariadb-git-db337eb8d8c2dc6c343b89ac78be8966d14a85fc.tar.gz
Bug #31240 load data infile replication between (4.0 or 4.1) and 5.1 fails
an additional changeset to remove printing a path name. mysql-test/suite/rpl/r/rpl_cross_version.result: removing a local exec env dependency mysql-test/suite/rpl/t/rpl_cross_version.test: refining a test to not have local exec env dependency.
-rw-r--r--mysql-test/suite/rpl/r/rpl_cross_version.result2
-rw-r--r--mysql-test/suite/rpl/t/rpl_cross_version.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_cross_version.result b/mysql-test/suite/rpl/r/rpl_cross_version.result
index 96bbbb03c49..de5dd134516 100644
--- a/mysql-test/suite/rpl/r/rpl_cross_version.result
+++ b/mysql-test/suite/rpl/r/rpl_cross_version.result
@@ -2,7 +2,7 @@
Setting up fake replication from MYSQL_TEST_DIR/suite/binlog/std_data/binlog_old_version_4_1.000001
==== Test ====
start slave sql_thread;
-==== a prove that the /home/andrei/MySQL/BZR/FIXES/bug31240-ldi_41_2_51/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001 has been processed successfully ====
+==== a prove that the fake has been processed successfully ====
SELECT COUNT(*) - 17920 as zero FROM t3;
zero
0
diff --git a/mysql-test/suite/rpl/t/rpl_cross_version.test b/mysql-test/suite/rpl/t/rpl_cross_version.test
index 9f81cf3a9e5..bb2ca350152 100644
--- a/mysql-test/suite/rpl/t/rpl_cross_version.test
+++ b/mysql-test/suite/rpl/t/rpl_cross_version.test
@@ -27,7 +27,7 @@ start slave sql_thread;
# end_log_pos of the last event of the relay log
--let $slave_param_value = 149436
--source include/wait_for_slave_param.inc
---echo ==== a prove that the $fake_relay_log has been processed successfully ====
+--echo ==== a prove that the fake has been processed successfully ====
SELECT COUNT(*) - 17920 as zero FROM t3;
--echo ==== Clean up ====