bk commit into 5.1 tree (kent:1.2212) BUG#17861

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2212 06/03/02 22:53:38 kent@stripped +2 -0
  mysql-test-run.pl:
    Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
  mysqld_safe.sh:
    Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861

  mysql-test/mysql-test-run.pl
    1.78 06/03/02 22:47:38 kent@stripped +2 -2
    Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'

  scripts/mysqld_safe.sh
    1.81 06/03/02 22:42:43 kent@stripped +2 -7
    Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861

# 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:	kent
# Host:	c-524072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.80/scripts/mysqld_safe.sh	2005-11-01 21:15:05 +01:00
+++ 1.81/scripts/mysqld_safe.sh	2006-03-02 22:42:43 +01:00
@@ -213,15 +213,10 @@
   chown $user $mysql_unix_port_dir
 fi
 
-# Use the mysqld-max binary by default if the user doesn't specify a binary
+# If the user doesn't specify a binary, we assume name "mysqld"
 if test -z "$MYSQLD"
 then
-  if test -x $ledir/mysqld-max
-  then
-    MYSQLD=mysqld-max
-  else
-    MYSQLD=mysqld
-  fi
+  MYSQLD=mysqld
 fi
 
 if test ! -x $ledir/$MYSQLD

--- 1.77/mysql-test/mysql-test-run.pl	2006-03-01 15:29:31 +01:00
+++ 1.78/mysql-test/mysql-test-run.pl	2006-03-02 22:47:38 +01:00
@@ -987,10 +987,10 @@
                                            # New CMake locations.
                                            "$glob_basedir/client/release",
                                            "$glob_basedir/client/debug");
-      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-max",
-                                           "$path_client_bindir/mysqld-nt",
+      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt",
                                            "$path_client_bindir/mysqld",
                                            "$path_client_bindir/mysqld-debug",
+                                           "$path_client_bindir/mysqld-max",
                                            "$glob_basedir/sql/release/mysqld",
                                            "$glob_basedir/sql/debug/mysqld");
       $path_language=      mtr_path_exists("$glob_basedir/share/english/",