summaryrefslogtreecommitdiffstats
path: root/plugin/user_variables
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:13 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:13 +0000
commit86fbb58c3ac0865482819c10a3e81f2eea001c36 (patch)
tree28c9e526ea739c6f9b89e36115e1e2698bddf981 /plugin/user_variables
parentReleasing progress-linux version 1:10.11.6-2~progress7.99u1. (diff)
downloadmariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.tar.xz
mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.zip
Merging upstream version 1:10.11.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'plugin/user_variables')
-rw-r--r--plugin/user_variables/user_variables.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc
index df2ab4af..79c96704 100644
--- a/plugin/user_variables/user_variables.cc
+++ b/plugin/user_variables/user_variables.cc
@@ -79,9 +79,9 @@ static int user_variables_fill(THD *thd, TABLE_LIST *tables, COND *cond)
else
return 1;
- const LEX_CSTRING *tmp= var->unsigned_flag ?
- &unsigned_result_types[var->type] :
- &result_types[var->type];
+ const LEX_CSTRING *tmp= var->type_handler()->is_unsigned() ?
+ &unsigned_result_types[var->type_handler()->result_type()] :
+ &result_types[var->type_handler()->result_type()];
field[2]->store(tmp->str, tmp->length, system_charset_info);
if (var->charset())