database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

5.0-rt -> 5.1-rt after-merge fixes.

Browse Source 
mysql-test/lib/mtr_im.pl:
  Fix merge.
mysql-test/lib/mtr_process.pl:
  Fix merge.
mysql-test/r/im_daemon_life_cycle.result:
  Fix merge.
mysql-test/t/im_daemon_life_cycle.imtest:
  Fix merge.
This commit is contained in:
unknown
2006-09-28 15:40:23 +04:00
parent eaf199de22
commit 5871cf09a9
4 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/lib/mtr_im.pl
View File

@@ -249,7 +249,7 @@ sub mtr_im_check_main_alive($) {
# Check that IM does not accept client connections. # Check that IM does not accept client connections.
if ( mtr_ping_mysqld_server($im->{'port'}) ) if ( mtr_ping_port($im->{'port'}) )
{ {
mtr_debug("IM-main (port: $im->{port}) " . mtr_debug("IM-main (port: $im->{port}) " .
"is accepting connections."); "is accepting connections.");
@@ -338,7 +338,7 @@ sub mtr_im_check_mysqld_alive($) {
# Check that mysqld does not accept client connections. # Check that mysqld does not accept client connections.
if ( mtr_ping_mysqld_server($mysqld_instance->{'port'}) ) if ( mtr_ping_port($mysqld_instance->{'port'}) )
{ {
mtr_debug("Mysqld instance (port: $mysqld_instance->{port}) " . mtr_debug("Mysqld instance (port: $mysqld_instance->{port}) " .
"is accepting connections."); "is accepting connections.");
@@ -510,7 +510,7 @@ sub mtr_im_wait_for_connection($$$) {
{ {
mtr_debug("Trying to connect to IM ($cur_attempt of $total_attempts)..."); mtr_debug("Trying to connect to IM ($cur_attempt of $total_attempts)...");
if ( mtr_ping_mysqld_server($im->{'port'}) ) if ( mtr_ping_port($im->{'port'}) )
{ {
mtr_debug("IM is accepting connections " . mtr_debug("IM is accepting connections " .
"on port $im->{port}."); "on port $im->{port}.");
@@ -543,7 +543,7 @@ sub mtr_im_wait_for_mysqld($$$) {
mtr_debug("Trying to connect to mysqld " . mtr_debug("Trying to connect to mysqld " .
"($cur_attempt of $total_attempts)..."); "($cur_attempt of $total_attempts)...");
if ( mtr_ping_mysqld_server($mysqld->{'port'}) ) if ( mtr_ping_port($mysqld->{'port'}) )
{ {
mtr_debug("Mysqld is accepting connections " . mtr_debug("Mysqld is accepting connections " .
"on port $mysqld->{port}."); "on port $mysqld->{port}.");

24
mysql-test/lib/mtr_process.pl
View File

@@ -26,28 +26,6 @@ sub mtr_kill_processes ($);
sub mtr_ping_with_timeout($); sub mtr_ping_with_timeout($);
sub mtr_ping_port ($); sub mtr_ping_port ($);
# Private IM-related operations.
sub mtr_im_kill_process ($$$);
sub mtr_im_load_pids ($);
sub mtr_im_terminate ($);
sub mtr_im_check_alive ($);
sub mtr_im_check_main_alive ($);
sub mtr_im_check_angel_alive ($);
sub mtr_im_check_mysqlds_alive ($);
sub mtr_im_check_mysqld_alive ($$);
sub mtr_im_cleanup ($);
sub mtr_im_rm_file ($);
sub mtr_im_errlog ($);
sub mtr_im_kill ($);
sub mtr_im_wait_for_connection ($$$);
sub mtr_im_wait_for_mysqld($$$);
# Public IM-related operations.
sub mtr_im_start ($$);
sub mtr_im_stop ($$);
# static in C # static in C
sub spawn_impl ($$$$$$$$); sub spawn_impl ($$$$$$$$);
@@ -1110,7 +1088,7 @@ sub mtr_kill_processes ($) {
{ {
foreach my $sig (15, 9) foreach my $sig (15, 9)
{ {
last if mtr_im_kill_process([ $pid ], $sig, 10); last if mtr_im_kill_process([ $pid ], $sig, 10, 1);
} }
} }
} }

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

@@ -18,7 +18,7 @@ Killing the process...
Sleeping... Sleeping...
Success: the process was restarted. Success: the process was restarted.
SHOW INSTANCE STATUS mysqld1; SHOW INSTANCE STATUS mysqld1;
instance_name status version instance_name state version_number version mysqld_compatible
mysqld1 online VERSION mysqld1 online VERSION_NUMBER VERSION no
STOP INSTANCE mysqld2; STOP INSTANCE mysqld2;
Success: the process has been stopped. Success: the process has been stopped.

2
mysql-test/t/im_daemon_life_cycle.imtest
View File

@@ -48,7 +48,7 @@ START INSTANCE mysqld2;
--sleep 3 --sleep 3
--replace_column 3 VERSION --replace_column 3 VERSION_NUMBER 4 VERSION
SHOW INSTANCE STATUS mysqld1; SHOW INSTANCE STATUS mysqld1;
# 4. Stop mysqld2, because it will not be stopped by IM, as it is nonguarded. # 4. Stop mysqld2, because it will not be stopped by IM, as it is nonguarded.