summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-03-03 14:57:02 +0100
committerunknown <guilhem@mysql.com>2003-03-03 14:57:02 +0100
commit285541505844c01546c37a46fcad92685e99cd3c (patch)
treefd83eff12d93aed16d4c3a046b54c1a9d345eb69 /mysql-test/r
parent5387425aeb951b87121765610212de621f702c5f (diff)
downloadmariadb-git-285541505844c01546c37a46fcad92685e99cd3c.tar.gz
Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
+ fix for #70 + test result fix for LOAD DATA LOCAL bug #82 client/mysqltest.c: Removed wrong comment and useless sleep mysql-test/mysql-test-run.sh: Fix $slave_datadir variable because this if [ -n "$1" ] ; slave_datadir="var/$slave_ident-data/" else slave_datadir=$SLAVE_MYDDIR was not coherent and led to problems of master.info not being deleted. Delete relay-log.info too. mysql-test/r/rpl000001.result: SUM is 1022 (1021 was when we had the LOAD DATA LOCAL bug #82). It's logical to have an even number as we load the same file twice. sql/slave.cc: When we RESET SLAVE, clear rli->master_log_* to give a good display in SHOW SLAVE STATUS ; seeing the old values may confuse the user. When we START SLAVE, clear rli->master_log_name, not only rli->master_log_pos. sql/sql_repl.cc: When we RESET SLAVE, clear mi->master_log_* to give a good display in SHOW SLAVE STATUS (bug #70)
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/rpl000001.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index 2d277571296..f3b52b43b19 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -32,7 +32,7 @@ n
2
select sum(length(word)) from t1;
sum(length(word))
-1021
+1022
drop table t1,t3;
reset master;
slave stop;