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_get_diagnostics.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_get_diagnostics.cc')
| -rw-r--r-- | sql/sql_get_diagnostics.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_get_diagnostics.cc b/sql/sql_get_diagnostics.cc index e7ab6cc3c75..6a3cec79160 100644 --- a/sql/sql_get_diagnostics.cc +++ b/sql/sql_get_diagnostics.cc @@ -69,7 +69,7 @@ Sql_cmd_get_diagnostics::execute(THD *thd) const char *sqlstate= new_stmt_da.get_sqlstate(); /* In case of a fatal error, set it into the original DA.*/ - if (thd->is_fatal_error) + if (unlikely(thd->is_fatal_error)) { save_stmt_da->set_error_status(sql_errno, message, sqlstate, NULL); DBUG_RETURN(true); @@ -81,7 +81,7 @@ Sql_cmd_get_diagnostics::execute(THD *thd) message); /* Appending might have failed. */ - if (! (rv= thd->is_error())) + if (unlikely(!(rv= thd->is_error()))) thd->get_stmt_da()->set_ok_status(0, 0, NULL); DBUG_RETURN(rv); |