Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0

into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P

configure.in

@@ -651,7 +651,7 @@ AC_ARG_ENABLE(assembler,
 
 AC_MSG_CHECKING(if we should use assembler functions)
 # For now we only support assembler on i386 and sparc systems
-AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386")
+AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $AS strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;))
 AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc")
 AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9")
 AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "")

mysql-test/lib/mtr_cases.pl

@@ -116,7 +116,7 @@ sub collect_test_cases ($) {
       while ( <DISABLED> )
       {
         chomp;
-        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
+        if ( /^\s*([^\s:]+)\s*:\s*(.*?)\s*$/ )
         {
           $disabled{$1}= $2;
         }

mysql-test/mysql-test-run.pl

@@ -3074,6 +3074,7 @@ sub run_mysqltest ($) {
   my $cmdline_mysql_client_test=
     "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " .
     "--port=$master->[0]->{'path_myport'} " .
+    "--vardir=$opt_vardir " .
     "--socket=$master->[0]->{'path_mysock'}";
 
   if ( $glob_use_embedded_server )

scripts/mysqld_safe.sh

@@ -321,10 +321,13 @@ then
     ulimit -n $open_files
     args="--open-files-limit=$open_files $args"
   fi
-  if test -n "$core_file_size"
-  then
-    ulimit -c $core_file_size
-  fi
+fi
+
+# Try to set the core file size (even if we aren't root) because many systems
+# don't specify a hard limit on core file size.
+if test -n "$core_file_size"
+then
+  ulimit -c $core_file_size
 fi
 
 #

tests/mysql_client_test.c

@@ -58,6 +58,7 @@ static unsigned int iter_count= 0;
 static my_bool have_innodb= FALSE;
 
 static const char *opt_basedir= "./";
+static const char *opt_vardir= "mysql-test/var";
 
 static longlong opt_getopt_ll_test= 0;
 
@@ -14883,6 +14884,7 @@ static void test_bug17667()
 
   struct buffer_and_length *statement_cursor;
   FILE *log_file;
+  char *master_log_filename;
 
   myheader("test_bug17667");
 
@@ -14894,7 +14896,13 @@ static void test_bug17667()
   }
 
   sleep(1); /* The server may need time to flush the data to the log. */
-  log_file= fopen("var/log/master.log", "r");
+
+  master_log_filename = (char *) malloc(strlen(opt_vardir) + strlen("/log/master.log") + 1);
+  strcpy(master_log_filename, opt_vardir);
+  strcat(master_log_filename, "/log/master.log");
+  log_file= fopen(master_log_filename, "r");
+  free(master_log_filename);
+
   if (log_file != NULL) {
 
     for (statement_cursor= statements; statement_cursor->buffer != NULL;
@@ -14918,7 +14926,7 @@ static void test_bug17667()
   }
   else
   {
-    fprintf(stderr, "Could not find the log file, var/log/master.log, so "
+    fprintf(stderr, "Could not find the log file, VARDIR/log/master.log, so "
             "test_bug17667 is \ninconclusive.  Run test from the "
             "mysql-test/mysql-test-run* program \nto set up the correct "
             "environment for this test.\n\n");
@@ -15062,6 +15070,8 @@ static struct my_option client_test_long_options[] =
   {"user", 'u', "User for login if not current user", (char **) &opt_user,
    (char **) &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
+  {"vardir", 'v', "Data dir for tests.", (gptr*) &opt_vardir,
+   (gptr*) &opt_vardir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"getopt-ll-test", 'g', "Option for testing bug in getopt library",
    (char **) &opt_getopt_ll_test, (char **) &opt_getopt_ll_test, 0,
    GET_LL, REQUIRED_ARG, 0, 0, LONGLONG_MAX, 0, 0, 0},