diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-22 15:33:34 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-22 15:33:34 +0200 |
| commit | 3e54e5393293426a9bfb7e6036f7e12bdb71d3b5 (patch) | |
| tree | ccd9b5c441de00d24eee19f6c4a55a4b4b7bfc6d /mysql-test/mysql-test-run.sh | |
| parent | 6632102983d7f413d77f3f735ec8b22f5ffdcdaf (diff) | |
| download | mariadb-git-3e54e5393293426a9bfb7e6036f7e12bdb71d3b5.tar.gz | |
Fixes for OSF1
Made test more reliable on slow machines
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Made --silent more silent
include/my_pthread.h:
Removed warning on OSF1
mysql-test/install_test_db.sh:
Allow connections from 127.0.0.1
mysql-test/mysql-test-run.sh:
Use mysqladmin ping to test if server is up
mysql-test/r/rpl000015.result:
Added sleep to make results repeatable
mysql-test/t/rpl000015.test:
Added sleep to make results repeatable
mysql-test/t/rpl000016.test:
Added sleep to make results repeatable
sql/sql_repl.cc:
added DBUG entry
sql/sql_table.cc:
Removed comparison of virtual functions as this didn't work on
Compaq C++ on OSF1
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 c49a6e0bedf..a63e909d823 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -35,6 +35,7 @@ RM=rm TIME=time TR=tr XARGS=`which xargs | head -1` +SED=sed # Are we using a source or a binary distribution? @@ -72,7 +73,7 @@ BASEDIR=`pwd` cd $CWD MYSQL_TEST_DIR=$BASEDIR/mysql-test STD_DATA=$MYSQL_TEST_DIR/std_data -SED=sed +hostname=`hostname` # Installed in the mysql privilege table TESTDIR="$MYSQL_TEST_DIR/t/" TESTSUFFIX=test @@ -238,10 +239,9 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov # Function Definitions #-- wait_for_server_start () - { - $MYSQL --no-defaults -u $DBUSER -e "select 1" --silent -w1 --host=127.0.0.1 --port=$1 \ - >/dev/null - } +{ + $MYSQLADMIN --no-defaults -u $DBUSER --silent -w2 --host=$hostname --port=$1 ping >/dev/null +} prompt_user () { |