diff options
| author | unknown <serg@serg.mylan> | 2004-04-30 19:18:36 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-30 19:18:36 +0200 |
| commit | d5c22bf33136c8154f93820b04c83bdc4255d87d (patch) | |
| tree | fddeaa90bbc2ebcbf73b190f5f3d210d1c638b0b | |
| parent | 136621525df3b1038a85d07f0d1df16c80eb5799 (diff) | |
| parent | 63e75e7b851305c1b81f126dda84d1fce99deec2 (diff) | |
| download | mariadb-git-d5c22bf33136c8154f93820b04c83bdc4255d87d.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/t/system_mysql_db_fix-master.opt | 2 | ||||
| -rw-r--r-- | 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 --*) ;; |