Commit a4ac987c authored by Sergei Golubchik's avatar Sergei Golubchik

more tests for mysql_install_db.exe

parent 7af62f8a
...@@ -11,7 +11,7 @@ let $counter= 5000; ...@@ -11,7 +11,7 @@ let $counter= 5000;
let $mysql_errno= 9999; let $mysql_errno= 9999;
while ($mysql_errno) while ($mysql_errno)
{ {
--error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013 --error 0,ER_ACCESS_DENIED_ERROR,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013
show status; show status;
dec $counter; dec $counter;
...@@ -19,13 +19,18 @@ while ($mysql_errno) ...@@ -19,13 +19,18 @@ while ($mysql_errno)
{ {
--die Server failed to restart --die Server failed to restart
} }
if (!$mysql_errno)
{
# WSREP: SHOW STATUS queries are allowed even if wsrep
# is not ready. Make sure wsrep is ready before
# returning from this script
source include/wait_wsrep_ready.inc;
}
if ($mysql_errno == 1045)
{
let $mysql_errno=0;
}
--sleep 0.1 --sleep 0.1
} }
--enable_query_log --enable_query_log
--enable_result_log --enable_result_log
# WSREP: SHOW STATUS queries are allowed even if wsrep
# is not ready. Make sure wsrep is ready before
# returning from this script
--source include/wait_wsrep_ready.inc
Running bootstrap Running bootstrap
Removing default user Removing default user
Allowing remote access for user root
Setting root password
Creating my.ini file Creating my.ini file
Creation of the database was successful Creation of the database was successful
# Kill the server # Kill the server
connect root,localhost,root,foo;
SELECT @@datadir; SELECT @@datadir;
@@datadir @@datadir
DATADIR/ DATADIR/
# Kill the server # Kill the server
connection default;
...@@ -3,12 +3,13 @@ ...@@ -3,12 +3,13 @@
# Create database in tmp directory using mysql_install_db.exe, # Create database in tmp directory using mysql_install_db.exe,
# and start server from this directory. # and start server from this directory.
let $ddir= $MYSQLTEST_VARDIR/tmp/ddir; let $ddir= $MYSQLTEST_VARDIR/tmp/ddir;
exec $MYSQL_INSTALL_DB_EXE --datadir=$ddir; exec $MYSQL_INSTALL_DB_EXE --datadir=$ddir --password=foo -R;
--source include/kill_mysqld.inc --source include/kill_mysqld.inc
let $restart_parameters=--datadir=$ddir --loose-innodb; let $restart_parameters=--datadir=$ddir --loose-innodb;
--source include/start_mysqld.inc --source include/start_mysqld.inc
connect root,localhost,root,foo;
# Smoke test - check that we're actually using datadir # Smoke test - check that we're actually using datadir
# we've created (i.e restart_parameters worked) # we've created (i.e restart_parameters worked)
--replace_result $ddir DATADIR --replace_result $ddir DATADIR
...@@ -18,5 +19,6 @@ SELECT @@datadir; ...@@ -18,5 +19,6 @@ SELECT @@datadir;
--source include/kill_mysqld.inc --source include/kill_mysqld.inc
rmdir $ddir; rmdir $ddir;
let $restart_parameters=; let $restart_parameters=;
connection default;
--source include/start_mysqld.inc --source include/start_mysqld.inc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment