10 files changed, 16 insertions, 12 deletions
diff --git a/mysql-test/include/im_check_env.inc b/mysql-test/include/im_check_env.inc
index 019e0984614..883e5d00fe4 100644
--- a/mysql-test/include/im_check_env.inc
+++ b/mysql-test/include/im_check_env.inc
@@ -22,4 +22,5 @@ SHOW VARIABLES LIKE 'server_id';
 # Check that IM understands that mysqld1 is online, while mysqld2 is
 # offline.
 
+--replace_result starting XXXXX online XXXXX
 SHOW INSTANCES;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b7c2d247ca9..809d9d9d168 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1576,7 +1576,8 @@ sub environment_setup () {
   if ( $opt_source_dist )
   {
     push(@ld_library_paths, "$glob_basedir/libmysql/.libs/",
-                            "$glob_basedir/libmysql_r/.libs/");
+                            "$glob_basedir/libmysql_r/.libs/",
+                            "$glob_basedir/zlib.libs/");
   }
   else
   {
@@ -2992,10 +2993,6 @@ sub do_after_run_mysqltest($)
   # Save info from this testcase run to mysqltest.log
   mtr_appendfile_to_file($path_timefile, $path_mysqltest_log)
     if -f $path_timefile;
-
-  # Remove the file that mysqltest writes info to
-  unlink($path_timefile);
-
 }
 
 
@@ -3183,6 +3180,9 @@ sub run_testcase ($) {
     }
   }
 
+  # Remove the file that mysqltest writes info to
+  unlink($path_timefile);
+
   # ----------------------------------------------------------------------
   # Stop Instance Manager if we are processing an IM-test case.
   # ----------------------------------------------------------------------
@@ -4095,7 +4095,6 @@ sub run_testcase_start_servers($) {
 
     if ( $clusters->[0]->{'pid'} and ! $master->[1]->{'pid'} )
     {
-    {
       # Test needs cluster, start an extra mysqld connected to cluster
 
       if ( $mysql_version_id >= 50100 )
@@ -4848,4 +4847,3 @@ HERE
   mtr_exit(1);
 
 }
-
diff --git a/mysql-test/r/ctype_cp1250_ch.result b/mysql-test/r/ctype_cp1250_ch.result
index 73f415732cd..4b02fa2182a 100644
--- a/mysql-test/r/ctype_cp1250_ch.result
+++ b/mysql-test/r/ctype_cp1250_ch.result
@@ -1,3 +1,4 @@
+drop table if exists t1;
 DROP TABLE IF EXISTS t1;
 SHOW COLLATION LIKE 'cp1250_czech_cs';
 Collation	Charset	Id	Default	Compiled	Sortlen
diff --git a/mysql-test/r/im_cmd_line.result b/mysql-test/r/im_cmd_line.result
index a4c21c36415..a862d465904 100644
--- a/mysql-test/r/im_cmd_line.result
+++ b/mysql-test/r/im_cmd_line.result
@@ -3,7 +3,7 @@ Variable_name	Value
 server_id	1
 SHOW INSTANCES;
 instance_name	state
-mysqld1	starting
+mysqld1	XXXXX
 mysqld2	offline
 --> Listing users...
 im_admin
diff --git a/mysql-test/r/im_daemon_life_cycle.result b/mysql-test/r/im_daemon_life_cycle.result
index 397f4d5d503..4fe15460ae5 100644
--- a/mysql-test/r/im_daemon_life_cycle.result
+++ b/mysql-test/r/im_daemon_life_cycle.result
@@ -3,7 +3,7 @@ Variable_name	Value
 server_id	1
 SHOW INSTANCES;
 instance_name	state
-mysqld1	online
+mysqld1	XXXXX
 mysqld2	offline
 Killing the process...
 Sleeping...
diff --git a/mysql-test/r/im_instance_conf.result b/mysql-test/r/im_instance_conf.result
index 597a1be428e..d04ae0270ab 100644
--- a/mysql-test/r/im_instance_conf.result
+++ b/mysql-test/r/im_instance_conf.result
@@ -3,7 +3,7 @@ Variable_name	Value
 server_id	1
 SHOW INSTANCES;
 instance_name	state
-mysqld1	online
+mysqld1	XXXXX
 mysqld2	offline
 --------------------------------------------------------------------
 server_id           = 1
diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result
index c403411c399..fb25f4a0768 100644
--- a/mysql-test/r/im_life_cycle.result
+++ b/mysql-test/r/im_life_cycle.result
@@ -3,7 +3,7 @@ Variable_name	Value
 server_id	1
 SHOW INSTANCES;
 instance_name	state
-mysqld1	online
+mysqld1	XXXXX
 mysqld2	offline
 
 --------------------------------------------------------------------
diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result
index 6e40c9bb1c0..b7c68965ada 100644
--- a/mysql-test/r/im_utils.result
+++ b/mysql-test/r/im_utils.result
@@ -3,7 +3,7 @@ Variable_name	Value
 server_id	1
 SHOW INSTANCES;
 instance_name	state
-mysqld1	online
+mysqld1	XXXXX
 mysqld2	offline
 SHOW INSTANCE OPTIONS mysqld1;
 option_name	value
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 2836b96d7b5..d9d754c91e6 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -280,6 +280,7 @@ create table general_log_new like general_log;
 create table slow_log_new like slow_log;
 show tables like "%log%";
 Tables_in_mysql (%log%)
+binlog_index
 general_log
 general_log_new
 slow_log
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 0d3b7cdfdeb..c21f3661667 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -16,6 +16,9 @@ concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
+ndb_restore_partition    : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone
+rpl_ndb_sync             : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone
+
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated