From f4b02f99372830041b6ba870a4069d5864b914d6 Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Fri, 30 Apr 2004 00:14:56 +0300
Subject: [PATCH] Portability fixes

mysql-test/mysql-test-run.sh:
  Avoid 'too many arguments' error
mysql-test/t/system_mysql_db_fix-master.opt:
  Add missing newline
scripts/mysql_fix_privilege_tables.sh:
  Portability fix
---
 mysql-test/mysql-test-run.sh                | 2 +-
 mysql-test/t/system_mysql_db_fix-master.opt | 2 +-
 scripts/mysql_fix_privilege_tables.sh       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index ccbd8586967..1671e9416fb 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/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
diff --git a/mysql-test/t/system_mysql_db_fix-master.opt b/mysql-test/t/system_mysql_db_fix-master.opt
index 69eb9d2cbf0..7e4fa9a3ee8 100644
--- a/mysql-test/t/system_mysql_db_fix-master.opt
+++ b/mysql-test/t/system_mysql_db_fix-master.opt
@@ -1 +1 @@
---result-file=system_mysql_db
\ No newline at end of file
+--result-file=system_mysql_db
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index f5f641525cc..2fbcd76c318 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/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
   --*) ;;