diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:37 +0100 |
| commit | 182ffc0cc8a0b389e5a31ae0e2c03c7a629f43de (patch) | |
| tree | e703e57c965a6f98787534e77e4bf894695b183c /sql | |
| parent | 517b1f4fb4ad587741a7f900100d307120f4d55d (diff) | |
| download | mariadb-git-182ffc0cc8a0b389e5a31ae0e2c03c7a629f43de.tar.gz | |
remove #ifdef ENABLE_BEFORE_END_OF_MERGE_QQ
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 57ce33c49af..510ccdd528f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3815,17 +3815,13 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) However, this should never happen, so better to assert and fix this. */ -#ifdef ENABLE_BEFORE_END_OF_MERGE_QQ DBUG_ASSERT(thd); -#endif if (thd) { DBUG_PRINT("info", ("memory_used: %lld size: %lld", (longlong) thd->status_var.memory_used, size)); thd->status_var.memory_used+= size; -#ifdef ENABLE_BEFORE_END_OF_MERGE_QQ DBUG_ASSERT((longlong) thd->status_var.memory_used >= 0); -#endif } } } diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 127b40283ea..2316dee3aee 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1631,9 +1631,7 @@ THD::~THD() { DBUG_PRINT("error", ("memory_used: %lld", status_var.memory_used)); SAFEMALLOC_REPORT_MEMORY(my_thread_dbug_id()); -#ifdef ENABLE_BEFORE_END_OF_MERGE_QQ DBUG_ASSERT(status_var.memory_used == 0); // Ensure everything is freed -#endif } set_current_thd(orig_thd); |