diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-16 22:09:10 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-16 22:09:10 +0400 |
| commit | 793c30612ac1a2736018919649973e6c3d30cfe8 (patch) | |
| tree | 9b40ddfb35af3b50d0b25f3ef372ac695ccb5c61 /sql/sql_acl.cc | |
| parent | 0270e811d047d3892d7641724e5ab7ca15b37f65 (diff) | |
| parent | 43b9ff1b21b2d645e5cd52d82878a48b47b01f8d (diff) | |
| download | mariadb-git-793c30612ac1a2736018919649973e6c3d30cfe8.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_insert.cc:
merging
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index ee7127fcd8d..e9122723e5a 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -6086,6 +6086,8 @@ int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, COND *cond) char *curr_host= thd->security_ctx->priv_host_name(); DBUG_ENTER("fill_schema_user_privileges"); + if (!initialized) + DBUG_RETURN(0); pthread_mutex_lock(&acl_cache->lock); for (counter=0 ; counter < acl_users.elements ; counter++) @@ -6145,6 +6147,8 @@ int fill_schema_schema_privileges(THD *thd, TABLE_LIST *tables, COND *cond) char *curr_host= thd->security_ctx->priv_host_name(); DBUG_ENTER("fill_schema_schema_privileges"); + if (!initialized) + DBUG_RETURN(0); pthread_mutex_lock(&acl_cache->lock); for (counter=0 ; counter < acl_dbs.elements ; counter++) |