diff options
| author | unknown <serg@serg.mylan> | 2004-11-28 20:42:04 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-28 20:42:04 +0100 |
| commit | 8b244fc665efa74d4aa95fd1910680327dc779bf (patch) | |
| tree | 73ac6d40766844cf3ca373cf0b7e4edf0a7a5be0 /scripts/mysql_fix_privilege_tables.sh | |
| parent | 4c9c3f32de96fd9a35ee1a9337dab1da6f99fddb (diff) | |
| parent | 1b898a22460a369b8ca21f573973a8a0518e85d4 (diff) | |
| download | mariadb-git-8b244fc665efa74d4aa95fd1910680327dc779bf.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/slave.cc:
Auto merged
mysql-test/r/select.result:
!bk-eb
mysql-test/t/select.test:
!bk-eb
Diffstat (limited to 'scripts/mysql_fix_privilege_tables.sh')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index 2d6434a0eb5..659c16ab493 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -105,7 +105,7 @@ then done fi -cmd="$bindir/mysql -f --user=$user --host=$host" +cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host" if test ! -z "$password" ; then cmd="$cmd --password=$password" fi |