diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-22 15:05:11 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-22 15:05:11 -0700 |
| commit | a7178989a22957727cae83de4c0eff078d8e60a1 (patch) | |
| tree | 18fac541370eed6d6619f07e64d288a8a6742b12 /mysql-test/mysql-test-run.sh | |
| parent | 78fc1ed4bda14ca6e34aa55c4ad100a3020b5914 (diff) | |
| download | mariadb-git-a7178989a22957727cae83de4c0eff078d8e60a1.tar.gz | |
post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the
new server getting started before the old one completely finished
shutdown. This should fix the pid warning we've been getting as well as
inconsistent results when running tests with the manager
libmysqld/lib_sql.cc:
post-merge fix
mysql-test/mysql-test-run.sh:
fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.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
sql/log_event.cc:
post-merge fix
sql/slave.cc:
post-merge fix
sql/slave.h:
post-merge fix
sql/sql_class.h:
post-merge fix
tools/mysqlmanager.c:
added debug message
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 3c8760ad7e5..b9ebac4445d 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -149,6 +149,7 @@ SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging RES_SPACE=" " MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \ myisammrg heap sql" +MY_LOG_DIR="$MYSQL_TEST_DIR/var/log" # # Set LD_LIBRARY_PATH if we are using shared libraries # @@ -181,8 +182,8 @@ SLEEP_TIME_FOR_FIRST_SLAVE=400 SLEEP_TIME_FOR_SECOND_SLAVE=30 CHARACTER_SET=latin1 DBUSER="" -START_WAIT_TIMEOUT=3 -STOP_WAIT_TIMEOUT=3 +START_WAIT_TIMEOUT=10 +STOP_WAIT_TIMEOUT=10 while test $# -gt 0; do case "$1" in @@ -521,7 +522,7 @@ report_stats () { deci=`$EXPR $raw - $xwhole` $ECHO "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% successful." $ECHO "" - $ECHO "The log files in $MYSQL_TEST_DIR/var/log may give you some hint" + $ECHO "The log files in $MY_LOG_DIR may give you some hint" $ECHO "of what when wrong." $ECHO "If you want to report this error, please read first the documentation at" $ECHO "http://www.mysql.com/doc/M/y/MySQL_test_suite.html" @@ -530,8 +531,7 @@ report_stats () { mysql_install_db () { $ECHO "Removing Stale Files" - $RM -rf $MASTER_MYDDIR $SLAVE_MYDDIR $SLAVE_MYLOG $MASTER_MYLOG \ - $SLAVE_MYERR $MASTER_MYERR + $RM -rf $MASTER_MYDDIR $SLAVE_MYDDIR $MY_LOG_DIR/* $ECHO "Installing Master Databases" $INSTALL_DB if [ $? != 0 ]; then |