diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-06-15 20:16:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-06-22 12:56:33 +0200 |
| commit | b6ce68f450ce06db989febf4dc3e2428d6400dd7 (patch) | |
| tree | 3f8bf4f580225b1e17c1af00ebad0884179f137d /sql/sql_class.cc | |
| parent | d937916c064d46076f5cec2280d91870ed7576d4 (diff) | |
| download | mariadb-git-b6ce68f450ce06db989febf4dc3e2428d6400dd7.tar.gz | |
MDEV-13012 Assertion `share->error' failed in discover_handlerton upon executing statement with max_session_mem_used = 8192
and
MDEV-13011 Server crashes in THD::handle_condition or Assertion `! is_set() || m_can_overwrite_status' fails upon attempt to connect with max_session_mem_used = 8192
errors when a connection is killed in the
* TABLE_SHARE::init_from_sql_statement_string()
* THD::init()
also, safety-wise, don't check max_mem_used on free() and when some error
was already issued.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 304036a67ff..6fb74d6e14c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -879,6 +879,7 @@ THD::THD(bool is_wsrep_applier) debug_sync_control(0), #endif /* defined(ENABLED_DEBUG_SYNC) */ wait_for_commit_ptr(0), + m_internal_handler(0), main_da(0, false, false), m_stmt_da(&main_da), tdc_hash_pins(0), @@ -1073,7 +1074,6 @@ THD::THD(bool is_wsrep_applier) MYF(MY_WME|MY_THREAD_SPECIFIC)); } - m_internal_handler= NULL; m_binlog_invoker= INVOKER_NONE; memset(&invoker_user, 0, sizeof(invoker_user)); memset(&invoker_host, 0, sizeof(invoker_host)); |