Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/my/mysql-4.0

mysql-test/mysql-test-run.sh

@@ -1447,7 +1447,7 @@ then
  if [ x$RECORD = x1 ]; then
   $ECHO "Will not run in record mode without a specific test case."
  else
-  for tf in `ls -1 $TESTDIR/*.$TESTSUFFIX | $SORT`
+  for tf in $TESTDIR/*.$TESTSUFFIX
   do
     run_testcase $tf
   done

scripts/mysql_fix_privilege_tables.sh

@@ -42,7 +42,7 @@ database="mysql"
 bindir="@bindir@"
 
 # Old format where there is only one argument and it's the password
-if test "$#" == 1
+if test "$#" = 1
 then
   case "$1" in
   --*) ;;