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 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 15:13:43 +03:00
parent 26b96094ec f2b4972bd4
commit c6ac1e39b6
214 changed files with 5163 additions and 2783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/item_timefunc.h
View File

@@ -997,7 +997,10 @@ class Item_func_tochar :public Item_str_func
bool check_arguments() const override
{
return check_argument_types_can_return_text(1, arg_count);
return
(args[0]->check_type_can_return_date(func_name_cstring()) &&
args[0]->check_type_can_return_time(func_name_cstring())) ||
check_argument_types_can_return_text(1, arg_count);
}
public: