diff options
| author | monty@mysql.com <> | 2006-01-06 12:48:14 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-01-06 12:48:14 +0200 |
| commit | 64cab9d76717e5fdd819b08858ca6db087e1c7fd (patch) | |
| tree | 793ca256831446270fd408c83d3b9199d44e6e72 /sql/sql_trigger.cc | |
| parent | b0a5ea01ef4a9ba0f41c2c263b3cc53a0611fc1a (diff) | |
| download | mariadb-git-64cab9d76717e5fdd819b08858ca6db087e1c7fd.tar.gz | |
After merge fix and a safety fix for handler
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 5f2d269ed1e..bbc32950c2d 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1189,9 +1189,10 @@ bool Table_triggers_list::process_triggers(THD *thd, trg_event_type event, save_query_tables_own_last= thd->lex->query_tables_own_last; thd->lex->query_tables_own_last= 0; - res= check_table_access(thd, SELECT_ACL | UPDATE_ACL, &table_list, 0); + err_status= check_table_access(thd, SELECT_ACL | UPDATE_ACL, + &table_list, 0); thd->lex->query_tables_own_last= save_query_tables_own_last; - if (res) + if (err_status) { sp_restore_security_context(thd, save_ctx); return TRUE; |