diff options
| author | unknown <thek@adventure.(none)> | 2008-02-01 17:00:54 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-02-01 17:00:54 +0100 |
| commit | 7d5a858d2c600d4b16d721b0159790ab6482afe3 (patch) | |
| tree | b07c1851333f61817c78d4edfedb18943062ea1e /sql/sql_acl.cc | |
| parent | eab1044e23dc74b7e11e0a1a6a0178c161a83c54 (diff) | |
| parent | bc070bd3b307f265a407968778f737f4e6482b81 (diff) | |
| download | mariadb-git-7d5a858d2c600d4b16d721b0159790ab6482afe3.tar.gz | |
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index da0b7bb89fc..72ce81e2ef7 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3041,6 +3041,12 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, } #endif + /* + The lock api is depending on the thd->lex variable which needs to be + re-initialized. + */ + Query_tables_list backup; + thd->lex->reset_n_backup_query_tables_list(&backup); if (simple_open_n_lock_tables(thd,tables)) { // Should never happen close_thread_tables(thd); /* purecov: deadcode */ @@ -3173,6 +3179,7 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, send_ok(thd); /* Tables are automatically closed */ + thd->lex->restore_backup_query_tables_list(&backup); DBUG_RETURN(result); } |