Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

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 abi_check
+BUILT_SOURCES =		mysql_version.h my_config.h
 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 \
@@ -62,7 +62,7 @@ dist-hook:
 
 # 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
+           my_alloc.h typelib.h mysql_h.ic
 	@set -ex; \
 	if [ @ICHECK@ != no ] ; then \
 	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \

mysql-test/lib/mtr_stress.pl

@@ -122,7 +122,7 @@ sub run_stress_test ()
 
   mtr_init_args(\$args);
   
-  mtr_add_arg($args, "--server-socket=%s", $::master->[0]->{'path_mysock'});
+  mtr_add_arg($args, "--server-socket=%s", $::master->[0]->{'path_sock'});
   mtr_add_arg($args, "--server-user=%s", $::opt_user);
   mtr_add_arg($args, "--server-database=%s", "test");  
   mtr_add_arg($args, "--stress-suite-basedir=%s", $::glob_mysql_test_dir);  
@@ -140,7 +140,7 @@ sub run_stress_test ()
 
   if ( $::opt_stress_init_file )
   {
-    mtr_add_arg($args, "--stress-init-file=%", $::opt_stress_init_file);
+    mtr_add_arg($args, "--stress-init-file=%s", $::opt_stress_init_file);
   }
 
   if ( !$::opt_stress_loop_count && !$::opt_stress_test_count &&
@@ -168,10 +168,9 @@ sub run_stress_test ()
 
   #Run stress test
   mtr_run("$::glob_mysql_test_dir/mysql-stress-test.pl", $args, "", "", "", "");
-   
   if ( ! $::glob_use_embedded_server )
   {
-    stop_masters();
+    stop_all_servers();
   }
 }
 

mysql-test/t/disabled.def

@@ -9,6 +9,8 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
+user_limits     : Bug#23921 random failure of user_limits.test
+
 im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog