diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-22 04:46:32 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-22 04:46:32 +0200 |
| commit | e99292d4690304e6e04f70904a91331642cdbe44 (patch) | |
| tree | 706d31806ab806cae4a610724441da534fb9f793 /mysql-test/mysql-test-run.sh | |
| parent | 75c376fbbbce097f360551024e17fe1662b1f6ef (diff) | |
| download | mariadb-git-e99292d4690304e6e04f70904a91331642cdbe44.tar.gz | |
keep bk happy
Docs/manual.texi:
Changelog
mysql-test/mysql-test-run.sh:
Added missing --user
sql/ha_berkeley.cc:
Fixed bug in SHOW LOGS
sql/item_func.cc:
Cleanup; Fixed possible problem with NULL
sql/mini_client.cc:
cleanup
sql/slave.cc:
Cleanup
sql/sql_repl.cc:
Fixed timing problem where we could miss a broadcast
sql/sql_show.cc:
Fixed bug in SHOW LOGS when there wasn't any log files
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 66bda2ac7fb..c49a6e0bedf 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -239,7 +239,7 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov #-- wait_for_server_start () { - $MYSQL -e "select 1" --silent -w1 --host=127.0.0.1 --port=$1 \ + $MYSQL --no-defaults -u $DBUSER -e "select 1" --silent -w1 --host=127.0.0.1 --port=$1 \ >/dev/null } @@ -492,7 +492,7 @@ mysql_restart () { mysql_loadstd () { - cp $STD_DATA/*.frm $STD_DATA/*.MRG $MASTER_MYDDIR/test + # cp $STD_DATA/*.frm $STD_DATA/*.MRG $MASTER_MYDDIR/test return 1 } |