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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-17 20:02:29 +02:00
parent 95de5248c7 0459d2ccfc
commit a8c5635cf1
41 changed files with 710 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_jsonfunc.cc
View File

@@ -1628,7 +1628,7 @@ bool is_json_type(const Item *item)
if (Type_handler_json_common::is_json_type_handler(item->type_handler()))
return true;
const Item_func_conv_charset *func;
if (!(func= dynamic_cast<const Item_func_conv_charset*>(item)))
if (!(func= dynamic_cast<const Item_func_conv_charset*>(item->real_item())))
return false;
item= func->arguments()[0];
}