diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 65cce38e788..260427c1e2b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3630,7 +3630,9 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) DBUG_PRINT("info", ("memory_used: %lld size: %lld", (longlong) thd->status_var.memory_used, size)); thd->status_var.memory_used+= size; +#ifndef ENABLE_BEFORE_END_OF_MERGE DBUG_ASSERT((longlong) thd->status_var.memory_used >= 0); +#endif } } } |