bk commit into 5.1 tree (paul:1.2204)

[paul]

Below is the list of changes that have just been committed into a local
5.1 repository of paul. When paul 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
  1.2204 06/02/28 15:14:31 paul@stripped +3 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

  mysql-test/r/mysqltest.result
    1.36 06/02/28 15:14:25 paul@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.305 06/02/28 15:14:25 paul@stripped +0 -0
    Auto merged

  client/mysqltest.c
    1.192 06/02/28 15:14:25 paul@stripped +0 -0
    Auto merged

# 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:	paul
# Host:	snake-hub.snake.net
# Root:	/src/extern/MySQL/bk/mysql-5.1/RESYNC

--- 1.304/mysql-test/mysql-test-run.sh	2006-02-27 09:58:31 -06:00
+++ 1.305/mysql-test/mysql-test-run.sh	2006-02-28 15:14:25 -06:00
@@ -962,7 +962,7 @@
     $DIFF -c $result_file $reject_file
     echo "-------------------------------------------------------"
     echo "Please follow the instructions outlined at"
-    echo "http://www.mysql.com/doc/en/Reporting_mysqltest_bugs.html"
+    echo "http://dev.mysql.com/doc/mysql/en/reporting-mysqltest-bugs.html"
     echo "to find the reason to this problem and how to report this."
     echo ""
   fi
@@ -1062,7 +1062,7 @@
         $ECHO "The log files in $MY_LOG_DIR may give you some hint"
 	$ECHO "of what went wrong."
 	$ECHO "If you want to report this error, please read first the documentation at"
-        $ECHO "http://www.mysql.com/doc/en/MySQL_test_suite.html"
+        $ECHO "http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html"
     fi
 
     if [ $USE_RUNNING_SERVER -eq 0 ]

--- 1.35/mysql-test/r/mysqltest.result	2006-02-25 12:35:06 -06:00
+++ 1.36/mysql-test/r/mysqltest.result	2006-02-28 15:14:25 -06:00
@@ -296,7 +296,9 @@
 In loop
 here is the sourced script
 mysqltest: At line 1: Missing argument to sleep
+mysqltest: At line 1: Missing argument to real_sleep
 mysqltest: At line 1: Invalid argument to sleep "abc"
+mysqltest: At line 1: Invalid argument to real_sleep "abc"
 1
 2
 101

--- 1.191/client/mysqltest.c	2006-02-28 14:05:14 -06:00
+++ 1.192/client/mysqltest.c	2006-02-28 15:14:25 -06:00
@@ -1774,7 +1774,7 @@
    do_sleep()
     q	       called command
     real_sleep  use the value from opt_sleep as number of seconds to sleep
-	            if real_sleep is false
+                if real_sleep is false
 
   DESCRIPTION
     sleep <seconds>
@@ -1795,18 +1795,19 @@
   char *p= query->first_argument;
   char *sleep_start, *sleep_end= query->end;
   double sleep_val;
+  char *cmd = (real_sleep ? "real_sleep" : "sleep");
 
   while (my_isspace(charset_info, *p))
     p++;
   if (!*p)
-    die("Missing argument to sleep");
+    die("Missing argument to %s", cmd);
   sleep_start= p;
   /* Check that arg starts with a digit, not handled by my_strtod */
   if (!my_isdigit(charset_info, *sleep_start))
-    die("Invalid argument to sleep \"%s\"", query->first_argument);
+    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);
   sleep_val= my_strtod(sleep_start, &sleep_end, &error);
   if (error)
-    die("Invalid argument to sleep \"%s\"", query->first_argument);
+    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);
 
   /* Fixed sleep time selected by --sleep option */
   if (opt_sleep && !real_sleep)