diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
| commit | 6c6c3af6aac428df8a934beeba15cc4ce77cbe01 (patch) | |
| tree | 2f8241944db8952e6a54a417414773dd0b5b0b4e /sql/sql_error.cc | |
| parent | b4f1f42062d108230b62ad49fedd93ee6e38e168 (diff) | |
| parent | c7c2f8d4a0dedd52795b7f8a6971c35ea46cc016 (diff) | |
| download | mariadb-git-10.2-test1234.tar.gz | |
Merge branch '10.2' into 10.2-mdev986410.2-test1234
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index b72d642efbc..1d234c578e3 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -347,6 +347,7 @@ void Diagnostics_area::reset_diagnostics_area() { DBUG_ENTER("reset_diagnostics_area"); + m_skip_flush= FALSE; #ifdef DBUG_OFF m_can_overwrite_status= FALSE; /** Don't take chances in production */ |