Merge with 4.0.6

BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
heap/hp_delete.c:
  Auto merged
heap/hp_scan.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/uniques.cc:
  Auto merged
strings/strto.c:
  Auto merged
vio/vio.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Add changeset to commit messages
sql-bench/crash-me.sh:
  Use version from 4.0
sql-bench/server-cfg.sh:
  Use version from 4.0

1 files changed, 50 insertions, 21 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 745cde325f9..edfff5c4d46 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -47,13 +47,17 @@ which ()
 
 sleep_until_file_deleted ()
 {
-  file=$1
+  pid=$1;
+  file=$2
   loop=$SLEEP_TIME_FOR_DELETE
   while (test $loop -gt 0)
   do
     if [ ! -r $file ]
     then
-      sleep $SLEEP_TIME_AFTER_RESTART
+      if test $pid != "0"
+      then
+        wait_for_pid $pid
+      fi
       return
     fi
     sleep 1
@@ -79,6 +83,13 @@ sleep_until_file_created ()
   exit 1;
 }
 
+# For the future
+
+wait_for_pid()
+{
+  pid=$1
+}
+
 # No paths below as we can't be sure where the program is!
 
 SED=sed
@@ -152,6 +163,7 @@ TOT_TEST=0
 USERT=0
 SYST=0
 REALT=0
+FAST_START=""
 MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp
 SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging
 RES_SPACE="      "
@@ -319,7 +331,7 @@ while test $# -gt 0; do
       VALGRIND="valgrind --alignment=8 --leak-check=yes"
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc"
-      SLEEP_TIME_AFTER_RESTART=60
+      #SLEEP_TIME_AFTER_RESTART=120
       SLEEP_TIME_FOR_DELETE=60
       ;;
     --valgrind-options=*)
@@ -340,6 +352,9 @@ while test $# -gt 0; do
        --debug=d:t:i:O,$MYSQL_TEST_DIR/var/log/slave.trace"
       EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --debug"
       ;;
+    --fast)
+      FAST_START=1
+      ;;
     -- )  shift; break ;;
     --* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
     * ) break ;;
@@ -736,12 +751,19 @@ EOF
 
 manager_term()
 {
-  ident=$1
+  pid=$1
+  ident=$2
   shift
   if [ $USE_MANAGER = 0 ] ; then
-    $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$ident.sock -O \
-    connect_timeout=5 -O shutdown_timeout=20 shutdown >> $MYSQL_MANAGER_LOG 2>&1
-    return
+    $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$ident.sock --connect_timeout=5 --shutdown_timeout=20 shutdown >> $MYSQL_MANAGER_LOG 2>&1
+    res=$?
+    # Some systems require an extra connect
+    $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$ident.sock --connect_timeout=1 ping >> $MYSQL_MANAGER_LOG 2>&1
+    if test $res = 0
+    then
+      wait_for_pid $pid
+    fi
+    return $res
   fi
   $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT --user=$MYSQL_MANAGER_USER \
    --password=$MYSQL_MANAGER_PW  --port=$MYSQL_MANAGER_PORT <<EOF
@@ -983,12 +1005,13 @@ stop_slave ()
   fi
   if [ x$this_slave_running = x1 ]
   then
-    manager_term $slave_ident
+    pid=`$CAT $slave_pid`
+    manager_term $pid $slave_ident
     if [ $? != 0 ] && [ -f $slave_pid ]
     then # try harder!
       $ECHO "slave not cooperating with mysqladmin, will try manual kill"
-      kill `$CAT $slave_pid`
-      sleep_until_file_deleted $slave_pid
+      kill $pid
+      sleep_until_file_deleted $pid $slave_pid
       if [ -f $slave_pid ] ; then
         $ECHO "slave refused to die. Sending SIGKILL"
         kill -9 `$CAT $slave_pid`
@@ -1007,12 +1030,13 @@ stop_master ()
 {
   if [ x$MASTER_RUNNING = x1 ]
   then
-    manager_term master
+    pid=`$CAT $MASTER_MYPID`
+    manager_term $pid master
     if [ $? != 0 ] && [ -f $MASTER_MYPID ]
     then # try harder!
       $ECHO "master not cooperating with mysqladmin, will try manual kill"
-      kill `$CAT $MASTER_MYPID`
-      sleep_until_file_deleted $MASTER_MYPID
+      kill $pid
+      sleep_until_file_deleted $pid $MASTER_MYPID
       if [ -f $MASTER_MYPID ] ; then
         $ECHO "master refused to die. Sending SIGKILL"
         kill -9 `$CAT $MASTER_MYPID`
@@ -1233,14 +1257,19 @@ run_testcase ()
 
 if [ -z "$USE_RUNNING_SERVER" ]
 then
-  # Ensure that no old mysqld test servers are running
-  $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
-  $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
-  $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
-  $MYSQLADMIN --no-defaults --host=$hostname --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
-  $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
-  sleep_until_file_deleted $MASTER_MYPID
-  sleep_until_file_deleted $SLAVE_MYPID
+  if [ -z "$FAST_START" ]
+  then
+    # Ensure that no old mysqld test servers are running
+    $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
+    $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
+    $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
+    $MYSQLADMIN --no-defaults --host=$hostname --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
+    $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
+    sleep_until_file_deleted 0 $MASTER_MYPID
+    sleep_until_file_deleted 0 $SLAVE_MYPID
+  else
+    rm $MASTER_MYPID $SLAVE_MYPID
+  fi
 
   # Kill any running managers
   if [ -f "$MANAGER_PID_FILE" ]