summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorgkodinov/kgeorge@magare.gmz <>2007-07-30 18:27:36 +0300
committergkodinov/kgeorge@magare.gmz <>2007-07-30 18:27:36 +0300
commit9a0e6ec6d2aadd14badb65aa6e5c313ce72e276e (patch)
tree3a0bd3810b778a710ddd3bc97e13539062f58cdc /sql/sql_table.cc
parentb6bb988d12f7df7033cbb9cebc58036d264ad26e (diff)
downloadmariadb-git-9a0e6ec6d2aadd14badb65aa6e5c313ce72e276e.tar.gz
(pushing for Andrei)
Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack Once had been set the flag might later got reset inside of a stored routine execution stack. The reason was in that there was no check if a new statement started at time of resetting. The artifact affects most of binlogable DML queries. Notice, that multi-update is wrapped up within bug@27716 fix, multi-delete bug@29136. Fixed with saving parent's statement flag of whether the statement modified non-transactional table, and unioning (merging) the value with that was gained in mysql_execute_command. Resettling thd->no_trans_update members into thd->transaction.`member`; Asserting code; Effectively the following properties are held. 1. At the end of a substatement thd->transaction.stmt.modified_non_trans_table reflects the fact if such a table got modified by the substatement. That also respects THD::really_abort_on_warnin() requirements. 2. Eventually thd->transaction.stmt.modified_non_trans_table will be computed as the union of the values of all invoked sub-statements. That fixes this bug#27417; Computing of thd->transaction.all.modified_non_trans_table is refined to base to the stmt's value for all the case including insert .. select statement which before the patch had an extra issue bug@28960. Minor issues are covered with mysql_load, mysql_delete, and binloggin of insert in to temp_table select. The supplied test verifies limitely, mostly asserts. The ultimate testing is defered for bug@13270, bug@23333.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 7db79543016..d83100aa439 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4091,7 +4091,6 @@ copy_data_between_tables(TABLE *from,TABLE *to,
alter_table_manage_keys(to, from->file->indexes_are_disabled(), keys_onoff);
/* We can abort alter table for any table type */
- thd->no_trans_update.stmt= FALSE;
thd->abort_on_warning= !ignore && test(thd->variables.sql_mode &
(MODE_STRICT_TRANS_TABLES |
MODE_STRICT_ALL_TABLES));