mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Huge pull
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe: Auto merged BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6: Auto merged include/mysql.h: Auto merged include/violite.h: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/lib_sql.cc: Auto merged libmysqld/lib_vio.c: Auto merged sql/field.h: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -2635,8 +2635,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)
|
||||
|
Reference in New Issue
Block a user