diff options
| author | monty@tik.mysql.fi <> | 2001-03-21 01:02:22 +0200 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2001-03-21 01:02:22 +0200 |
| commit | 6f9a73a1bae03ccf3e26371b453e31feb72fd2da (patch) | |
| tree | 8a311781a9b85fe972ca9c89a0dc75654d3b3250 /mysql-test | |
| parent | ef75476c671bda70da7b65e5c499790eea786ebb (diff) | |
| download | mariadb-git-6f9a73a1bae03ccf3e26371b453e31feb72fd2da.tar.gz | |
Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 16d26fc48b2..24b62a69b9f 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -241,7 +241,7 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov #-- wait_for_server_start () { - $MYSQLADMIN --no-defaults -u $DBUSER --silent -w2 --host=$hostname --port=$1 ping >/dev/null + $MYSQLADMIN --no-defaults -u $DBUSER --silent -O connect_timeout=10 -w2 --host=$hostname --port=$1 ping >/dev/null 2>&1 } prompt_user () |