bk commit into 5.1 tree (anozdrin:1.2330)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-28 15:40:23+04:00, anozdrin@alik. +4 -0
  5.0-rt -> 5.1-rt after-merge fixes.

  mysql-test/lib/mtr_im.pl@stripped, 2006-09-28 15:40:21+04:00, anozdrin@alik. +4 -4
    Fix merge.

  mysql-test/lib/mtr_process.pl@stripped, 2006-09-28 15:40:21+04:00, anozdrin@alik. +1 -23
    Fix merge.

  mysql-test/r/im_daemon_life_cycle.result@stripped, 2006-09-28 15:40:21+04:00, anozdrin@alik. +2 -2
    Fix merge.

  mysql-test/t/im_daemon_life_cycle.imtest@stripped, 2006-09-28 15:40:21+04:00, anozdrin@alik. +1 -1
    Fix merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	alik.
# Root:	/mnt/raid/alik/MySQL/devel/5.1-rt-merged

--- 1.1/mysql-test/lib/mtr_im.pl	2006-09-28 15:40:28 +04:00
+++ 1.2/mysql-test/lib/mtr_im.pl	2006-09-28 15:40:28 +04:00
@@ -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}.");

--- 1.7/mysql-test/r/im_daemon_life_cycle.result	2006-09-28 15:40:28 +04:00
+++ 1.8/mysql-test/r/im_daemon_life_cycle.result	2006-09-28 15:40:28 +04:00
@@ -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.

--- 1.6/mysql-test/t/im_daemon_life_cycle.imtest	2006-09-28 15:40:28 +04:00
+++ 1.7/mysql-test/t/im_daemon_life_cycle.imtest	2006-09-28 15:40:28 +04:00
@@ -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.

--- 1.51/mysql-test/lib/mtr_process.pl	2006-09-28 15:40:28 +04:00
+++ 1.52/mysql-test/lib/mtr_process.pl	2006-09-28 15:40:28 +04:00
@@ -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);
     }
   }
 }