diff options
| author | unknown <monty@tik.mysql.fi> | 2001-03-21 01:02:22 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-03-21 01:02:22 +0200 |
| commit | 6257ee7613836c397bda6c3533ca4a114d60e045 (patch) | |
| tree | 8a311781a9b85fe972ca9c89a0dc75654d3b3250 /mysql-test/mysql-test-run.sh | |
| parent | d1782bea92ebf698cdcf898007f3b015ba502493 (diff) | |
| download | mariadb-git-6257ee7613836c397bda6c3533ca4a114d60e045.tar.gz | |
Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
Docs/manual.texi:
Updated information about SET TRANSACTION ISOLATION LEVEL
configure.in:
Upgraded version number
isam/_dbug.c:
Fixed wrong fprintf
isam/isamchk.c:
Added new error message
myisam/mi_check.c:
Added new error message
mysql-test/mysql-test-run.sh:
Don't wait too long for server start
mysys/mf_keycache.c:
Cleaned up some error messages
scripts/mysqlhotcopy.sh:
Applied patch for --resetmaster --resetslave
sql-bench/bench-init.pl.sh:
Fix for windows
sql/handler.cc:
Added isolation levels and gemini spinlocks
sql/handler.h:
Added isolation levels
sql/item_strfunc.cc:
Cleanup of CONCAT_WS()
sql/lex.h:
Added isolation levels
sql/mysql_priv.h:
Added isolation levels
sql/mysqld.cc:
Added isolation levels
sql/sql_class.cc:
Added isolation levels
Moved variable initialization to different code segments
sql/sql_class.h:
Added isolation levels
sql/sql_lex.h:
Added isolation levels
sql/sql_parse.cc:
Added isolation levels
sql/sql_update.cc:
cleanup
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -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 () |