diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 16:48:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 16:48:28 +0200 |
| commit | 8d70097c216081e8013a548bfbde156e48985816 (patch) | |
| tree | 4cca4f27d804ab261db2ee996f084fb5137833df /sql/sql_parse.cc | |
| parent | 079c3599711b9cbd3ce323f32cf99693cc3d5e3b (diff) | |
| parent | 252e690c859b53c51c7eecf072f33dbaaa01bcdf (diff) | |
| download | mariadb-git-8d70097c216081e8013a548bfbde156e48985816.tar.gz | |
Merge 10.1 to 10.2
Follow-up fix to MDEV-14008: Let Field_double::val_uint() silently
return 0 on error
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7a4530082eb..391972ea89a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2379,11 +2379,12 @@ com_multi_end: THD_STAGE_INFO(thd, stage_cleaning_up); thd->reset_query(); - thd->set_examined_row_count(0); // For processlist - thd->set_command(COM_SLEEP); /* Performance Schema Interface instrumentation, end */ MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da()); + thd->set_examined_row_count(0); // For processlist + thd->set_command(COM_SLEEP); + thd->m_statement_psi= NULL; thd->m_digest= NULL; |