diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2002-12-12 12:49:56 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2002-12-12 12:49:56 +0400 |
| commit | e9525947d4eaf19e2edb17d8c688fe6ffba02502 (patch) | |
| tree | 15affb8818d0219c1b4f8fb6c72b3226bc757ef7 /sql/sql_acl.cc | |
| parent | 4ed872632e784de11b97ae5ef1210f4f5765b51b (diff) | |
| parent | a9f1388b54992916b11717ad0045538de92813a1 (diff) | |
| download | mariadb-git-e9525947d4eaf19e2edb17d8c688fe6ffba02502.tar.gz | |
Resolving merge conflicts
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
libmysqld/lib_sql.cc:
merging
sql/item_strfunc.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 cde6ace1470..f77cb6ca20f 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2706,8 +2706,12 @@ ulong get_table_grant(THD *thd, TABLE_LIST *table) GRANT_TABLE *grant_table; rw_rdlock(&LOCK_grant); +#ifdef EMBEDDED_LIBRARY + grant_table= NULL; +#else grant_table = table_hash_search(thd->host,thd->ip,db,user, table->real_name,0); +#endif table->grant.grant_table=grant_table; // Remember for column test table->grant.version=grant_version; if (grant_table) |