summaryrefslogtreecommitdiff
path: root/sql/item_xmlfunc.cc
diff options
context:
space:
mode:
authorRucha Deodhar <rucha.deodhar@mariadb.com>2022-01-26 03:02:45 +0530
committerRucha Deodhar <rucha.deodhar@mariadb.com>2022-03-30 17:00:17 +0530
commit3eb1e11d8a68b5667193d14d718b5e672fe18fb7 (patch)
tree741082e6b477928875c9147296528cee9f30ab13 /sql/item_xmlfunc.cc
parent12abe61af44205a17c75ace71252db1bad05b184 (diff)
downloadmariadb-git-3eb1e11d8a68b5667193d14d718b5e672fe18fb7.tar.gz
MDEV-23479: Add a THD* argument to Item_func_or_sum::fix_length_and_dec()
Fix: Added THD *thd argument in Item_func_or_sum::fix_length_and_dec() and in fix_length_and_dec() for all derived classes of Item_func_or_sum.
Diffstat (limited to 'sql/item_xmlfunc.cc')
-rw-r--r--sql/item_xmlfunc.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index a130be4f973..7c209060c37 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -189,7 +189,7 @@ public:
}
return str;
}
- bool fix_length_and_dec() override
+ bool fix_length_and_dec(THD *thd) override
{
max_length= MAX_BLOB_WIDTH;
collation.collation= pxml->charset();
@@ -469,7 +469,7 @@ public:
{
return nodeset->copy(*native_cache);
}
- bool fix_length_and_dec() override
+ bool fix_length_and_dec(THD *thd) override
{ max_length= MAX_BLOB_WIDTH; return FALSE; }
Item *get_copy(THD *thd) override
{ return get_item_copy<Item_nodeset_context_cache>(thd, this); }
@@ -487,7 +487,7 @@ public:
{
return { STRING_WITH_LEN("xpath_position") };
}
- bool fix_length_and_dec() override { max_length=10; return FALSE; }
+ bool fix_length_and_dec(THD *thd) override { max_length=10; return FALSE; }
longlong val_int() override
{
args[0]->val_native(current_thd, &tmp_native_value);
@@ -511,7 +511,7 @@ public:
{
return { STRING_WITH_LEN("xpath_count") };
}
- bool fix_length_and_dec() override { max_length=10; return FALSE; }
+ bool fix_length_and_dec(THD *thd) override { max_length=10; return FALSE; }
longlong val_int() override
{
uint predicate_supplied_context_size;
@@ -2766,7 +2766,7 @@ my_xpath_parse(MY_XPATH *xpath, const char *str, const char *strend)
}
-bool Item_xml_str_func::fix_length_and_dec()
+bool Item_xml_str_func::fix_length_and_dec(THD *thd)
{
max_length= MAX_BLOB_WIDTH;
return agg_arg_charsets_for_comparison(collation, args, arg_count);