database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Merged.
This commit is contained in:
unknown
2007-02-23 21:55:14 +03:00
parent 1264c5826e 37a5703bc7
commit 4f4de12237
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

@ -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

2
mysql-test/r/im_daemon_life_cycle.result
View File

@ -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.