summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl000001.test
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-08-18 16:04:26 +0300
committerunknown <monty@hundin.mysql.fi>2002-08-18 16:04:26 +0300
commit457172d99256e68a93ab69eecbef23a3db7ef1c4 (patch)
treeaf1548211472940ebe3bad8ee24a4d2ab26f2c92 /mysql-test/t/rpl000001.test
parent36827564d3d8d6f18e13d79bebed75572c21f769 (diff)
downloadmariadb-git-457172d99256e68a93ab69eecbef23a3db7ef1c4.tar.gz
Fixed timing problem with rpl000001 replication test.
Fixed configure problems with HPUX and openbsd SHOW SLAVE STATUS returns empty set if slave is not initialized SHOW MASTER STATUS returns empty set if binary logging is not enabled. Fixed shutdown problem on Solaris. BitKeeper/deleted/.del-set_var.cc~5374527de1955359: Delete: libmysqld/set_var.cc BitKeeper/etc/ignore: added libmysqld/set_var.cc Build-tools/Do-compile: Remove warnings from touch during compilation Docs/manual.texi: Changelog client/mysqltest.c: Added real_sleep command configure.in: Fixed type for HPUX10 innobase/configure.in: Fixed type for openbsd libmysql/libmysql.c: Fix for new SHOW SLAVE STATUS myisam/mi_update.c: Update key file if using external locking mysql-test/mysql-test-run.sh: Safety fix mysql-test/r/rpl000015.result: Update for new SHOW SLAVE STATUS mysql-test/r/rpl_empty_master_crash.result: Update for new SHOW SLAVE STATUS mysql-test/t/rpl000001.test: sleep -> real_sleep to avoid timing problem sql/mysqld.cc: Fixed bug with SIGTERM on Solaris sql/slave.cc: SHOW SLAVE STATUS returns empty sets if slave is not initialized. sql/sql_repl.cc: SHOW MASTER STAT returns empty set if no binary logging.
Diffstat (limited to 'mysql-test/t/rpl000001.test')
-rw-r--r--mysql-test/t/rpl000001.test4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index fb4255f27b3..0f195c65fb0 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -18,8 +18,10 @@ set password for root@"localhost" = password('foo');
connection slave;
slave start;
connection master;
+#
# Give slave time to do at last one failed connect retry
-sleep 2;
+# This one must be short so that the slave will not stop retrying
+real_sleep 2;
set password for root@"localhost" = password('');
# Give slave time to connect (will retry every second)
sleep 2;