Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a4ac987c
Commit
a4ac987c
authored
Dec 11, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more tests for mysql_install_db.exe
parent
7af62f8a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
8 deletions
+19
-8
mysql-test/include/wait_until_connected_again.inc
mysql-test/include/wait_until_connected_again.inc
+12
-7
mysql-test/main/mysql_install_db_win.result
mysql-test/main/mysql_install_db_win.result
+4
-0
mysql-test/main/mysql_install_db_win.test
mysql-test/main/mysql_install_db_win.test
+3
-1
No files found.
mysql-test/include/wait_until_connected_again.inc
View file @
a4ac987c
...
@@ -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
mysql-test/main/mysql_install_db_win.result
View file @
a4ac987c
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;
mysql-test/main/mysql_install_db_win.test
View file @
a4ac987c
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment