Skip to content

M
mariadb
Commit fe585401 authored by anozdrin/alik@alik.opbmk's avatar anozdrin/alik@alik.opbmk
Browse files
Options

Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build 

into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build
parents 54442698 90115eac
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/mysql-test-run.pl
View file @ fe585401
...@@ -3008,7 +3008,7 @@ language = $path_language ...@@ -3008,7 +3008,7 @@ language = $path_language
character-sets-dir = $path_charsetsdir character-sets-dir = $path_charsetsdir
basedir = $path_my_basedir basedir = $path_my_basedir
server_id = $server_id server_id = $server_id
shutdown-delay = 10 shutdown_delay = 10
skip-stack-trace skip-stack-trace
skip-innodb skip-innodb
skip-ndbcluster skip-ndbcluster
......
mysql-test/r/im_daemon_life_cycle.result
View file @ fe585401
...@@ -21,6 +21,6 @@ Success: the process was restarted. ...@@ -21,6 +21,6 @@ Success: the process was restarted.
Success: server is ready to accept connection on socket. Success: server is ready to accept connection on socket.
SHOW INSTANCE STATUS mysqld1; SHOW INSTANCE STATUS mysqld1;
instance_name state version_number version mysqld_compatible instance_name state version_number version mysqld_compatible
mysqld1 online VERSION_NUMBER VERSION no mysqld1 STATE VERSION_NUMBER VERSION no
STOP INSTANCE mysqld2; STOP INSTANCE mysqld2;
Success: the process has been stopped. Success: the process has been stopped.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7