summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-06-20 18:02:40 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-09-24 15:49:35 +0400
commitf5c3ad1913f60b02a283c5ba3ff53f6259b3f1a3 (patch)
treef3e1a86359eeb93c0d4bab1cad78fe09dded5b7e /sql/item_func.cc
parentad77e3ac0930a68e61378790a232f1056f0a8e7c (diff)
downloadmariadb-git-f5c3ad1913f60b02a283c5ba3ff53f6259b3f1a3.tar.gz
MDEV-16470 - Session user variables tracker
Based on contribution by Dapeng Huang.
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 10ac0f74644..2eb7250ebc7 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4671,6 +4671,10 @@ update_hash(user_var_entry *entry, bool set_null, void *ptr, size_t length,
entry->unsigned_flag= unsigned_arg;
}
entry->type=type;
+#ifndef EMBEDDED_LIBRARY
+ THD *thd= current_thd;
+ thd->session_tracker.user_variables.mark_as_changed(thd, entry);
+#endif
return 0;
}
@@ -4760,7 +4764,7 @@ longlong user_var_entry::val_int(bool *null_value) const
/** Get the value of a variable as a string. */
String *user_var_entry::val_str(bool *null_value, String *str,
- uint decimals)
+ uint decimals) const
{
if ((*null_value= (value == 0)))
return (String*) 0;