summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-05-20 16:29:11 +0400
committerAlexander Barkov <bar@mariadb.org>2017-05-20 16:29:11 +0400
commita8caa8e04a27f7463abd4fd588a4ce1799e600c7 (patch)
treeeed0aa6dbbe164a32d79e47d4be52c09ec55c1df /sql/item_jsonfunc.cc
parentd2fec340d25c24c8862f461b1f3272c098e67d54 (diff)
downloadmariadb-git-a8caa8e04a27f7463abd4fd588a4ce1799e600c7.tar.gz
MDEV-12854 Synchronize CREATE..SELECT data type and result set metadata data type for INT functions
Diffstat (limited to 'sql/item_jsonfunc.cc')
-rw-r--r--sql/item_jsonfunc.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
index fd5b4a98e0e..9e9b26e2119 100644
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -390,7 +390,7 @@ longlong Item_func_json_valid::val_int()
void Item_func_json_exists::fix_length_and_dec()
{
- Item_int_func::fix_length_and_dec();
+ Item_bool_func::fix_length_and_dec();
maybe_null= 1;
path.set_constant_flag(args[1]->const_item());
}
@@ -890,7 +890,7 @@ void Item_func_json_contains::fix_length_and_dec()
maybe_null= 1;
if (arg_count > 2)
path.set_constant_flag(args[2]->const_item());
- Item_int_func::fix_length_and_dec();
+ Item_bool_func::fix_length_and_dec();
}
@@ -1135,7 +1135,7 @@ void Item_func_json_contains_path::fix_length_and_dec()
ooa_parsed= FALSE;
maybe_null= 1;
mark_constant_paths(paths, args+2, arg_count-2);
- Item_int_func::fix_length_and_dec();
+ Item_bool_func::fix_length_and_dec();
}
@@ -2050,6 +2050,7 @@ void Item_func_json_length::fix_length_and_dec()
if (arg_count > 1)
path.set_constant_flag(args[1]->const_item());
maybe_null= 1;
+ max_length= 10;
}