database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 23:19:51 +02:00
parent a49f5525bb 7841a7eb09
commit ae6bdc6769
345 changed files with 7745 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_type.cc
View File

@ -1089,6 +1089,13 @@ Datetime::Datetime(THD *thd, int *warn, const MYSQL_TIME *from,
DBUG_ASSERT(is_valid_value_slow());
}
Datetime::Datetime(my_time_t unix_time, ulong second_part_arg,
const Time_zone* time_zone)
{
time_zone->gmt_sec_to_TIME(this, unix_time);
second_part= second_part_arg;
}
bool Temporal::datetime_add_nanoseconds_or_invalidate(THD *thd, int *warn, ulong nsec)
{
@ -8738,7 +8745,7 @@ bool Type_handler_string_result::Item_eq_value(THD *thd,
/***************************************************************************/
bool Type_handler_string_result::union_element_finalize(const Item * item) const
bool Type_handler_string_result::union_element_finalize(Item_type_holder* item) const
{
if (item->collation.derivation == DERIVATION_NONE)
{
@ -9034,6 +9041,12 @@ Type_handler_timestamp_common::Item_val_native_with_conversion(THD *thd,
TIME_to_native(thd, &ltime, to, item->datetime_precision(thd));
}
bool Type_handler_null::union_element_finalize(Item_type_holder *item) const
{
item->set_handler(&type_handler_string);
return false;
}
bool
Type_handler_timestamp_common::Item_val_native_with_conversion_result(THD *thd,