diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-21 18:05:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-21 21:43:07 +0200 |
| commit | 8d0448d5075fe822e37f81b740e83f03ab318448 (patch) | |
| tree | 2f00840442fdcd34d33291d4073aa09123afae08 /sql | |
| parent | cb1b466c0c3fa72a058fe6462261f70b11d45c53 (diff) | |
| download | mariadb-git-8d0448d5075fe822e37f81b740e83f03ab318448.tar.gz | |
MDEV-13861 Assertion `0' failed in Protocol::end_statement
followup for 378beed0a68 - only count WARN_LEVEL_ERROR,
not warnings or notes.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7429ac586ea..3aeb8127030 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1483,7 +1483,8 @@ public: const char* msg, Sql_condition ** cond_hdl) { - errors++; + if (level == Sql_condition::WARN_LEVEL_ERROR) + errors++; return false; } Counting_error_handler() : errors(0) {} |