From ba96c5aed699b284345506dbc0f239d13c747122 Mon Sep 17 00:00:00 2001
From: "anozdrin/alik@alik." <>
Date: Thu, 28 Sep 2006 15:40:23 +0400
Subject: [PATCH] 5.0-rt -> 5.1-rt after-merge fixes.
---
mysql-test/lib/mtr_im.pl | 8 ++++----
mysql-test/lib/mtr_process.pl | 24 +-----------------------
mysql-test/r/im_daemon_life_cycle.result | 4 ++--
mysql-test/t/im_daemon_life_cycle.imtest | 2 +-
4 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/mysql-test/lib/mtr_im.pl b/mysql-test/lib/mtr_im.pl
index 4a497cc7ed..ca17516278 100644
--- a/mysql-test/lib/mtr_im.pl
+++ b/mysql-test/lib/mtr_im.pl
@@ -249,7 +249,7 @@ sub mtr_im_check_main_alive($) {
# 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}) " .
"is accepting connections.");
@@ -338,7 +338,7 @@ sub mtr_im_check_mysqld_alive($) {
# 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}) " .
"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)...");
- if ( mtr_ping_mysqld_server($im->{'port'}) )
+ if ( mtr_ping_port($im->{'port'}) )
{
mtr_debug("IM is accepting connections " .
"on port $im->{port}.");
@@ -543,7 +543,7 @@ sub mtr_im_wait_for_mysqld($$$) {
mtr_debug("Trying to connect to mysqld " .
"($cur_attempt of $total_attempts)...");
- if ( mtr_ping_mysqld_server($mysqld->{'port'}) )
+ if ( mtr_ping_port($mysqld->{'port'}) )
{
mtr_debug("Mysqld is accepting connections " .
"on port $mysqld->{port}.");
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index b1cb56199f..027f5e0f95 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -26,28 +26,6 @@ sub mtr_kill_processes ($);
sub mtr_ping_with_timeout($);
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
sub spawn_impl ($$$$$$$$);
@@ -1110,7 +1088,7 @@ sub mtr_kill_processes ($) {
{
foreach my $sig (15, 9)
{
- last if mtr_im_kill_process([ $pid ], $sig, 10);
+ last if mtr_im_kill_process([ $pid ], $sig, 10, 1);
}
}
}
diff --git a/mysql-test/r/im_daemon_life_cycle.result b/mysql-test/r/im_daemon_life_cycle.result
index 19df329dd3..eee8479888 100644
--- a/mysql-test/r/im_daemon_life_cycle.result
+++ b/mysql-test/r/im_daemon_life_cycle.result
@@ -18,7 +18,7 @@ Killing the process...
Sleeping...
Success: the process was restarted.
SHOW INSTANCE STATUS mysqld1;
-instance_name status version
-mysqld1 online VERSION
+instance_name state version_number version mysqld_compatible
+mysqld1 online VERSION_NUMBER VERSION no
STOP INSTANCE mysqld2;
Success: the process has been stopped.
diff --git a/mysql-test/t/im_daemon_life_cycle.imtest b/mysql-test/t/im_daemon_life_cycle.imtest
index acd1f0d887..55e52f4e46 100644
--- a/mysql-test/t/im_daemon_life_cycle.imtest
+++ b/mysql-test/t/im_daemon_life_cycle.imtest
@@ -48,7 +48,7 @@ START INSTANCE mysqld2;
--sleep 3
---replace_column 3 VERSION
+--replace_column 3 VERSION_NUMBER 4 VERSION
SHOW INSTANCE STATUS mysqld1;
# 4. Stop mysqld2, because it will not be stopped by IM, as it is nonguarded.
--
2.30.9