database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

remove #ifdef ENABLE_BEFORE_END_OF_MERGE_QQ

Browse Source
This commit is contained in:
Sergei Golubchik
2013-12-09 12:38:37 +01:00
parent 517b1f4fb4
commit 182ffc0cc8
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@@ -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 However, this should never happen, so better to assert and
fix this. fix this.
*/ */
#ifdef ENABLE_BEFORE_END_OF_MERGE_QQ
DBUG_ASSERT(thd); DBUG_ASSERT(thd);
#endif
if (thd) if (thd)
{ {
DBUG_PRINT("info", ("memory_used: %lld size: %lld", DBUG_PRINT("info", ("memory_used: %lld size: %lld",
(longlong) thd->status_var.memory_used, size)); (longlong) thd->status_var.memory_used, size));
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); DBUG_ASSERT((longlong) thd->status_var.memory_used >= 0);
#endif
} }
} }
} }

2
sql/sql_class.cc
View File

@@ -1631,9 +1631,7 @@ THD::~THD()
{ {
DBUG_PRINT("error", ("memory_used: %lld", status_var.memory_used)); DBUG_PRINT("error", ("memory_used: %lld", status_var.memory_used));
SAFEMALLOC_REPORT_MEMORY(my_thread_dbug_id()); 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 DBUG_ASSERT(status_var.memory_used == 0); // Ensure everything is freed
#endif
} }
set_current_thd(orig_thd); set_current_thd(orig_thd);