diff options
| author | anozdrin@mysql.com <> | 2005-12-09 15:14:19 +0300 |
|---|---|---|
| committer | anozdrin@mysql.com <> | 2005-12-09 15:14:19 +0300 |
| commit | 5d105fb7e736708c13cc76284a44ae6ba1a7ae0b (patch) | |
| tree | e8d8d0e4221b70994cc2102da16ba5febf0e3f48 /sql/sql_trigger.cc | |
| parent | 081b2cc6c8e59666da4d4a5da6e5d22e93fe3fcc (diff) | |
| parent | b867ef6df010e1fdc9da4c20f8c0fa56147ae7b5 (diff) | |
| download | mariadb-git-5d105fb7e736708c13cc76284a44ae6ba1a7ae0b.tar.gz | |
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
into mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 8f8d292f2e2..8016d5fde1c 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1123,7 +1123,7 @@ bool Table_triggers_list::process_triggers(THD *thd, trg_event_type event, trg_action_time_type time_type, bool old_row_is_record1) { - int res= 0; + bool err_status= FALSE; sp_head *sp_trigger= bodies[event][time_type]; if (sp_trigger) @@ -1183,7 +1183,7 @@ bool Table_triggers_list::process_triggers(THD *thd, trg_event_type event, #endif // NO_EMBEDDED_ACCESS_CHECKS thd->reset_sub_statement_state(&statement_state, SUB_STMT_TRIGGER); - res= sp_trigger->execute_function(thd, 0, 0, 0); + err_status= sp_trigger->execute_function(thd, 0, 0, 0); thd->restore_sub_statement_state(&statement_state); #ifndef NO_EMBEDDED_ACCESS_CHECKS @@ -1191,7 +1191,7 @@ bool Table_triggers_list::process_triggers(THD *thd, trg_event_type event, #endif // NO_EMBEDDED_ACCESS_CHECKS } - return res; + return err_status; } |