diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 15:23:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 15:23:47 +0200 |
| commit | 1d3ea9ecd8c7f7e022eb4ee5e98326fc850d59b1 (patch) | |
| tree | f9abc493fa045bb684b884b81ae58c94e3e8ea38 /sql/sql_class.cc | |
| parent | dd0207bda440c2e44ba5223d0635538bc2974890 (diff) | |
| parent | d71d4119055f0184f5edd24e86fa3d6a5c71aa89 (diff) | |
| download | mariadb-git-1d3ea9ecd8c7f7e022eb4ee5e98326fc850d59b1.tar.gz | |
perfschema 5.6.24
including the big commit
commit 305130361bf72726de220f3d2b2787395e10be61
Author: Marc Alff <marc.alff@oracle.com>
Date: Tue Feb 10 11:31:32 2015 +0100
WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6
(with the following commits) and related changes in sql/
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1ef0827b943..ed2bddd7e8d 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -874,6 +874,7 @@ THD::THD() stmt_depends_on_first_successful_insert_id_in_prev_stmt(FALSE), m_examined_row_count(0), accessed_rows_and_keys(0), + m_digest(NULL), m_statement_psi(NULL), m_idle_psi(NULL), thread_id(0), @@ -1044,6 +1045,13 @@ THD::THD() substitute_null_with_insert_id = FALSE; thr_lock_info_init(&lock_info); /* safety: will be reset after start */ + m_token_array= NULL; + if (max_digest_length > 0) + { + m_token_array= (unsigned char*) my_malloc(max_digest_length, + MYF(MY_WME|MY_THREAD_SPECIFIC)); + } + m_internal_handler= NULL; m_binlog_invoker= INVOKER_NONE; arena_for_cached_items= 0; @@ -1625,6 +1633,7 @@ THD::~THD() #endif free_root(&main_mem_root, MYF(0)); + my_free(m_token_array); main_da.free_memory(); if (status_var.memory_used != 0) { |