bk commit into 5.0 tree (cmiller:1.2234)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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-07-13 11:11:20-04:00, cmiller@zippy.(none) +3 -0
  Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
  into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
  MERGE: 1.2191.27.4

  configure.in@stripped, 2006-07-13 11:07:30-04:00, cmiller@zippy.(none) +0 -0
    Auto merged
    MERGE: 1.396.3.1

  mysql-test/mysql-test-run.pl@stripped, 2006-07-13 11:07:31-04:00, cmiller@zippy.(none) +0 -0
    Auto merged
    MERGE: 1.102.1.1

  tests/mysql_client_test.c@stripped, 2006-07-13 11:11:18-04:00, cmiller@zippy.(none) +1 -2
    manual merge
    MERGE: 1.187.2.1

# 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:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/m50-maint--07C2P/RESYNC

--- 1.401/configure.in	2006-07-13 11:11:25 -04:00
+++ 1.402/configure.in	2006-07-13 11:11:25 -04:00
@@ -651,7 +651,7 @@
 
 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" = "")

--- 1.103/mysql-test/mysql-test-run.pl	2006-07-13 11:11:25 -04:00
+++ 1.104/mysql-test/mysql-test-run.pl	2006-07-13 11:11:25 -04:00
@@ -3074,6 +3074,7 @@
   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 )

--- 1.189/tests/mysql_client_test.c	2006-07-13 11:11:25 -04:00
+++ 1.190/tests/mysql_client_test.c	2006-07-13 11:11:25 -04:00
@@ -58,6 +58,7 @@
 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 @@
 
   struct buffer_and_length *statement_cursor;
   FILE *log_file;
+  char *master_log_filename;
 
   myheader("test_bug17667");
 
@@ -14894,7 +14896,13 @@
   }
 
   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 @@
   }
   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 @@
   {"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},