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 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2020-10-21 14:02:04 +03:00
parent a1b6691f93 b4c225ac35
commit 620ea816ad
47 changed files with 722 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@@ -417,6 +417,8 @@ int mysql_update(THD *thd,
query_plan.set_no_partitions();
if (thd->lex->describe || thd->lex->analyze_stmt)
goto produce_explain_and_leave;
if (thd->is_error())
DBUG_RETURN(1);
my_ok(thd); // No matching records
DBUG_RETURN(0);