mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user