mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

small code cleanup taken from MySQL 5.6

Browse source
This commit is contained in:
Sergei Golubchik 2012-12-16 21:45:45 +01:00
commit 4923d19b7c
12 changed files with 29 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_update.cc
View file

@ -643,10 +643,7 @@ int mysql_update(THD *thd,
THD_STAGE_INFO(thd, stage_updating);
transactional_table= table->file->has_transactions();
thd->abort_on_warning= test(!ignore &&
(thd->variables.sql_mode &
(MODE_STRICT_TRANS_TABLES |
MODE_STRICT_ALL_TABLES)));
thd->abort_on_warning= !ignore && thd->is_strict_mode();
if (table->triggers &&
table->triggers->has_triggers(TRG_EVENT_UPDATE,
TRG_ACTION_AFTER))
@ -1391,9 +1388,7 @@ bool mysql_multi_update(THD *thd,
DBUG_RETURN(TRUE);
}
thd->abort_on_warning= test(thd->variables.sql_mode &
(MODE_STRICT_TRANS_TABLES |
MODE_STRICT_ALL_TABLES));
thd->abort_on_warning= thd->is_strict_mode();
List<Item> total_list;