summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-21 14:02:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-21 14:02:04 +0300
commit620ea816adeceaba7c875679ab8505f4c07a22b8 (patch)
treea52749e4f0c1fd07bc9f0c2a1159706a4e7789c3 /sql/sql_update.cc
parenta1b6691f93e50ad4a8a53dbf89ba578d6a64b2cb (diff)
parentb4c225ac354686242b5336da84b7a758640936bd (diff)
downloadmariadb-git-620ea816adeceaba7c875679ab8505f4c07a22b8.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 2e9752eeabd..5e40cd242a4 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -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);