Commit e39e1c46 authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)

Merge mysql.com:/home/hf/work/26833/my50-26833

into  mysql.com:/home/hf/work/26833/my51-26833
parents bcc5499b 6088b025
...@@ -4705,7 +4705,7 @@ check_table_access(THD *thd, ulong want_access,TABLE_LIST *tables, ...@@ -4705,7 +4705,7 @@ check_table_access(THD *thd, ulong want_access,TABLE_LIST *tables,
{ {
uint found=0; uint found=0;
ulong found_access=0; ulong found_access=0;
#ifndef EMBEDDED_LIBRARY #ifndef NO_EMBEDDED_ACCESS_CHECKS
TABLE_LIST *org_tables= tables; TABLE_LIST *org_tables= tables;
#endif #endif
TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table(); TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment