diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-10 17:47:05 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-10 17:47:05 +0300 |
| commit | 73e86d62dedbf29fe76cc05270e6245432206201 (patch) | |
| tree | cafcb1d0d2a42df1417e331bc30c6c6e12c78cc9 /sql/sql_parse.cc | |
| parent | c0dbd4d9811e4c2433cd651d34bd5c6af72f5593 (diff) | |
| parent | aa3c4306754c3db0c2ea3a6db0cffcb6bc1ed0f7 (diff) | |
| download | mariadb-git-73e86d62dedbf29fe76cc05270e6245432206201.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
innobase/buf/buf0flu.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
Will merge later..
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1c8c917babe..1e42e776d44 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -36,7 +36,6 @@ extern "C" int gethostname(char *name, int namelen); static int check_for_max_user_connections(const char *user, int u_length, const char *host); static void decrease_user_connections(const char *user, const char *host); -static bool check_table_access(THD *thd,uint want_access, TABLE_LIST *tables); static bool check_db_used(THD *thd,TABLE_LIST *tables); static bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *tables); static bool check_dup(THD *thd,const char *db,const char *name, @@ -1956,7 +1955,7 @@ mysql_execute_command(void) else res = mysql_grant(thd, lex->db, lex->users_list, lex->grant, lex->sql_command == SQLCOM_REVOKE); - if(!res) + if (!res) { mysql_update_log.write(thd, thd->query,thd->query_length); if (mysql_bin_log.is_open()) @@ -2116,7 +2115,7 @@ bool check_process_priv(THD *thd) ** in the table list for GRANT checking */ -static bool +bool check_table_access(THD *thd,uint want_access,TABLE_LIST *tables) { uint found=0,found_access=0; |