diff options
| author | monty@mashka.mysql.fi <> | 2002-11-22 13:35:43 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-22 13:35:43 +0200 |
| commit | e1af5fb24d986d1b810415fe31af9fa5c88c4102 (patch) | |
| tree | db3e8af5263abbcc2aa4d04d35ea120434795969 /mysql-test/mysql-test-run.sh | |
| parent | 541c40b0006474fd444d90955cdb8aca0db21e4f (diff) | |
| download | mariadb-git-e1af5fb24d986d1b810415fe31af9fa5c88c4102.tar.gz | |
Fixed bug with indexed NULL column <=> NULL
Fix for Mac OS X shutdown
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 514ef9e704a..fcddf52c66b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -249,6 +249,7 @@ SLAVE_MYPID="$MYRUN_DIR/mysqld-slave.pid" SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld-slave.log" SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err" +CLIENT_MYLOG="$MYSQL_TEST_DIR/var/log/client.log" SMALL_SERVER="-O key_buffer_size=1M -O sort_buffer=256K -O max_heap_table_size=1M" export MASTER_MYPORT @@ -344,7 +345,7 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov #-- wait_for_server_start () { - $MYSQLADMIN --no-defaults -u $DBUSER --silent -O connect_timeout=10 -w3 --host=$hostname --port=$1 ping >/dev/null 2>&1 + $MYSQLADMIN --no-defaults -u $DBUSER --silent -O connect_timeout=10 -w3 --host=$hostname --port=$1 ping >> $CLIENT_MYLOG 2>&1 exit_code=$? if [ $exit_code != 0 ]; then echo "Error: Could not start $2, exit code $exit_code"; |