diff options
| author | unknown <monty@mysql.com> | 2004-11-26 02:31:22 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-26 02:31:22 +0200 |
| commit | 60af920628c435a5990c3ef7a753d0f374fc12cc (patch) | |
| tree | f3f4600d006f2d2d7d31180814236decb181095f /scripts | |
| parent | fecd27a1063ef32c7d1d3149321323de2c943364 (diff) | |
| download | mariadb-git-60af920628c435a5990c3ef7a753d0f374fc12cc.tar.gz | |
Fixes while reviewing code
(Cleanups and better bug fixes)
mysql-test/r/select.result:
Fixed test after wrong merge
mysql-test/t/select.test:
Fixed test after wrong merge
scripts/mysql_fix_privilege_tables.sh:
Don't read defaults files
sql/item_cmpfunc.cc:
Fix wrong value for not_null_tables_cache
sql/item_cmpfunc.h:
Remove wrong patch (flags are set in fix_length_and_dec())
sql/item_func.h:
Fix wrong value for not_null_tables_cache
sql/slave.cc:
Fixed indentation
Diffstat (limited to 'scripts')
| -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 2fbcd76c318..381cf599e32 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -74,7 +74,7 @@ parse_arguments() parse_arguments "$@" if test -z "$cmd"; then - cmd="$bindir/mysql -f --user=$user --host=$host" + cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host" if test ! -z "$root_password"; then cmd="$cmd --password=$root_password" fi |