diff --git a/include/Makefile.am b/include/Makefile.am
index b46e1a8402c..3faa25c4bb9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -15,7 +15,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-BUILT_SOURCES =		mysql_version.h my_config.h mysql_h.ic
+BUILT_SOURCES =		mysql_version.h my_config.h abi_check
 pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
 			mysql.h mysql_com.h mysql_embed.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h \
@@ -38,6 +38,8 @@ noinst_HEADERS =	config-win.h config-netware.h \
 # Remove built files and the symlinked directories
 CLEANFILES =            $(BUILT_SOURCES) readline openssl
 
+EXTRA_DIST =            mysql_h.ic
+
 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h $(CLEANFILES)
 
@@ -58,25 +60,17 @@ dist-hook:
 # Rules for checking that ABI has not changed
 #
 
-# Create a icheck file for mysql.h
-mysql_h.ic: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
-            my_alloc.h typelib.h
-	@set -x; \
-	if [ @ICHECK@ != no ] ; then \
-	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@ mysql.h; \
-	else \
-	  touch $@; \
-	fi;
-
-# Compare the icheck file to the reference
-check_abi: mysql_h.ic
+# Create a icheck file and compare it to the reference
+abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
+           my_alloc.h typelib.h
 	@set -ex; \
 	if [ @ICHECK@ != no ] ; then \
-	  @ICHECK@ --compare mysql_h.ic mysql_h_abi.ic; \
+	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \
+	  @ICHECK@ --compare mysql_h.ic $@.ic; \
 	fi; \
-	touch check_abi;
+	touch abi_check;
 
-#all: check_abi
+#all: abi_check
 
 
 # Don't update the files from bitkeeper
diff --git a/include/mysql_h_abi.ic b/include/mysql_h.ic
similarity index 100%
rename from include/mysql_h_abi.ic
rename to include/mysql_h.ic
diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl
index ea163eeba22..846ca25b725 100644
--- a/mysql-test/lib/mtr_misc.pl
+++ b/mysql-test/lib/mtr_misc.pl
@@ -66,9 +66,10 @@ sub mtr_add_arg ($$@) {
 
 ##############################################################################
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
-
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_path_exists (@) {
   foreach my $path ( @_ )
   {
@@ -84,9 +85,11 @@ sub mtr_path_exists (@) {
   }
 }
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
 
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_script_exists (@) {
   foreach my $path ( @_ )
   {
@@ -109,6 +112,11 @@ sub mtr_script_exists (@) {
   }
 }
 
+
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_file_exists (@) {
   foreach my $path ( @_ )
   {
@@ -117,20 +125,11 @@ sub mtr_file_exists (@) {
   return "";
 }
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
-
-sub mtr_file_exists (@) {
-  foreach my $path ( @_ )
-  {
-    return $path if -e $path;
-  }
-  return "";
-}
-
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
 
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_exe_maybe_exists (@) {
   my @path= @_;
 
@@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) {
   return "";
 }
 
-# Note - More specific paths should be given before less specific.  For examle
-# /client/debug should be listed before /client
 
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
 sub mtr_exe_exists (@) {
   my @path= @_;
   if (my $path= mtr_exe_maybe_exists(@path))
@@ -174,7 +175,7 @@ sub mtr_copy_dir($$) {
   my $from_dir= shift;
   my $to_dir= shift;
 
-#  mtr_verbose("Copying from $from_dir to $to_dir");
+  # mtr_verbose("Copying from $from_dir to $to_dir");
 
   mkpath("$to_dir");
   opendir(DIR, "$from_dir")
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 98e5027e8e1..c29cd4f6bee 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -670,7 +670,8 @@ sub command_line_setup () {
   $path_client_bindir= mtr_path_exists(vs_config_dirs('client', ''),
 				       "$glob_basedir/client_release",
 				       "$glob_basedir/client_debug",
-				       "$glob_basedir/client");
+				       "$glob_basedir/client",
+				       "$glob_basedir/bin");
 
   $exe_mysqld=         mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),
 				       "$glob_basedir/sql/mysqld",
@@ -1615,18 +1616,14 @@ sub environment_setup () {
   $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
   $ENV{'MYSQL_TCP_PORT'}=     $mysqld_variables{'port'};
 
-  $ENV{'EXE_MYSQL'}=          $exe_mysql;
-  $ENV{'IM_DEFAULTS_PATH'}=   $instance_manager->{defaults_file};
-  $ENV{'IM_PASSWORD_PATH'}=   $instance_manager->{password_file};
   $ENV{'IM_PATH_SOCK'}=       $instance_manager->{path_sock};
   $ENV{'IM_USERNAME'}=        $instance_manager->{admin_login};
   $ENV{'IM_PASSWORD'}=        $instance_manager->{admin_password};
   $ENV{MTR_BUILD_THREAD}= 0 unless $ENV{MTR_BUILD_THREAD}; # Set if not set
 
+  $ENV{'EXE_MYSQL'}=          $exe_mysql;
+
 
-# ----------------------------------------------------
-# Setup env so childs can execute mysqlcheck
-# ----------------------------------------------------
   # ----------------------------------------------------
   # Setup env for NDB
   # ----------------------------------------------------
@@ -1832,8 +1829,8 @@ sub environment_setup () {
 
 
   # ----------------------------------------------------
-# We are nice and report a bit about our settings
-# ----------------------------------------------------
+  # We are nice and report a bit about our settings
+  # ----------------------------------------------------
   if (!$opt_extern)
   {
     print "Using MTR_BUILD_THREAD      = $ENV{MTR_BUILD_THREAD}\n";
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 9115f9a9628..8e0a7adcebb 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -176,7 +176,7 @@ The commands reported in the bug report
 ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
 ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
 Too long dbname
-ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 Too long hostname
 ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
 End of 5.0 tests
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index bd77438704a..929f3226c49 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -216,7 +216,7 @@ drop table t17583;
 
 --echo Too long dbname
 --error 1
---exec echo '\r test_really_long_dbnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX localhost' | $MYSQL 2>&1
+--exec echo '\r test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx localhost' | $MYSQL 2>&1
 
 --echo Too long hostname
 --replace_regex /\([0-9]*\)/(errno)/