diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-31 10:44:20 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-31 10:44:20 +0200 |
| commit | ec952f21f8a4386045f5e5ac6fe44bf856ff2738 (patch) | |
| tree | 838752100454a55cfd45263336009cdf49830581 /sql/sql_parse.cc | |
| parent | 7806888465090c2fa3fb7ef7a8ffb0d149fcff07 (diff) | |
| parent | ea3ffb9b3efedc03baf011467a0b84f394b1b19e (diff) | |
| download | mariadb-git-ec952f21f8a4386045f5e5ac6fe44bf856ff2738.tar.gz | |
Merge
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index bdc6ab16a0e..7416506fd02 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3351,7 +3351,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables) if (options & REFRESH_GRANT) { acl_reload(thd); - grant_reload(); + grant_reload(thd); if (mqh_used) reset_mqh(thd,(LEX_USER *) NULL,true); } |