diff options
| author | unknown <monty@mysql.com> | 2004-03-19 18:33:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-19 18:33:38 +0200 |
| commit | 28813a9ea9b5149b7c370f616232ea60dadf852c (patch) | |
| tree | 7b70c20edffefc6a9a26014ddd3c8956f5248a2d /scripts/mysql_fix_privilege_tables.sh | |
| parent | 67ea8aac5e9e9ae98a22aff063c48053ea68e5de (diff) | |
| download | mariadb-git-28813a9ea9b5149b7c370f616232ea60dadf852c.tar.gz | |
Added test to show bug in current union implementation
After merge fixes
Portability fixes
client/mysqltest.c:
Fixed that unget() is done properly (needed for QNX where one can't do many ungetc() in a row)
include/errmsg.h:
After merge fixes
mysql-test/mysql-test-run.sh:
merge fix
mysql-test/r/system_mysql_db.result:
Updated results for 4.1
mysql-test/r/union.result:
Added new test
mysql-test/t/derived.test:
Portability fix (for Mac OS X)
mysql-test/t/system_mysql_db_refs.test:
Remove warnings
mysql-test/t/union.test:
Added test to show bug in current union implementation (to be fixed in 4.1)
scripts/mysql_create_system_tables.sh:
Fix wrong column define
scripts/mysql_fix_privilege_tables.sh:
Fix for mysql-test-run
scripts/mysql_fix_privilege_tables.sql:
Merge with 4.0 to get comments.
Updated so that it works with privilege tables for MySQL 3.23.
sql/repl_failsafe.cc:
After merge fix
Diffstat (limited to 'scripts/mysql_fix_privilege_tables.sh')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index 39a4554be77..69bf2bebaa8 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -56,21 +56,15 @@ parse_arguments() { # Get first arguments from the my.cfg file, groups [mysqld] and # [mysql_install_db], and then merge with the command line arguments -if test -x ./bin/my_print_defaults -then - print_defaults="./bin/my_print_defaults" -elif test -x @bindr@/my_print_defaults -then - print_defaults="@bindir@/my_print_defaults" -elif test -x @bindir@/mysql_print_defaults -then - print_defaults="@bindir@/mysql_print_defaults" -elif test -x extra/my_print_defaults -then - print_defaults="extra/my_print_defaults" -else - print_defaults="my_print_defaults" -fi + +for dir in ./bin @bindir@ @bindir@ extra $bindir/../bin $bindir/../extra +do + if test -x $dir/my_print_defaults + then + print_defaults="$dir/my_print_defaults" + break + fi +done parse_arguments `$print_defaults $defaults mysql_install_db mysql_fix_privilege_tables` parse_arguments PICK-ARGS-FROM-ARGV "$@" @@ -109,7 +103,6 @@ fi cmd="$bindir/mysql -f --user=$user --host=$host" if test -z "$password" ; then -else cmd="$cmd --password=$password" fi if test ! -z "$port"; then |