database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2016-06-28 22:01:55 +02:00
parent 6ce20fb2b9 0fdb17e6c3
commit 3361aee591
654 changed files with 30636 additions and 12494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@@ -1612,7 +1612,7 @@ bool mysql_multi_update(THD *thd,
DBUG_RETURN(TRUE);
}
thd->abort_on_warning= thd->is_strict_mode();
thd->abort_on_warning= !ignore && thd->is_strict_mode();
List<Item> total_list;
res= mysql_select(thd, &select_lex->ref_pointer_array,