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

Merge 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2024-01-19 09:07:48 +02:00
parent ac774a2656 9d20853c74
commit 9374772ecd
160 changed files with 2009 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/debug.cc
View File

@@ -40,7 +40,8 @@ bool debug_decrement_counter(const LEX_CSTRING *name)
THD *thd= current_thd;
user_var_entry *entry= (user_var_entry*)
my_hash_search(&thd->user_vars, (uchar*) name->str, name->length);
if (!entry || entry->type != INT_RESULT || ! entry->value)
if (!entry || !entry->value ||
entry->type_handler()->result_type() != INT_RESULT)
return 0;
(*(ulonglong*) entry->value)= (*(ulonglong*) entry->value)-1;
return !*(ulonglong*) entry->value;