diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /sql/sql_do.cc | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'sql/sql_do.cc')
| -rw-r--r-- | sql/sql_do.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_do.cc b/sql/sql_do.cc index 20a7aa75590..2a4e43ab78a 100644 --- a/sql/sql_do.cc +++ b/sql/sql_do.cc @@ -35,7 +35,7 @@ bool mysql_do(THD *thd, List<Item> &values) (void) value->is_null(); free_underlaid_joins(thd, &thd->lex->select_lex); - if (thd->is_error()) + if (unlikely(thd->is_error())) { /* Rollback the effect of the statement, since next instruction |