database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-06-13 19:01:28 +03:00
parent f9e53a659c d83a443250
commit 805340936a
42 changed files with 479 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_type.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2015,2019 MariaDB
Copyright (c) 2015, 2020, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -6147,7 +6147,7 @@ bool Type_handler_decimal_result::
bool Type_handler_temporal_result::
Item_func_plus_fix_length_and_dec(Item_func_plus *item) const
{
item->fix_length_and_dec_temporal();
item->fix_length_and_dec_temporal(true);
return false;
}
@ -6196,7 +6196,7 @@ bool Type_handler_decimal_result::
bool Type_handler_temporal_result::
Item_func_minus_fix_length_and_dec(Item_func_minus *item) const
{
item->fix_length_and_dec_temporal();
item->fix_length_and_dec_temporal(true);
return false;
}
@ -6245,7 +6245,7 @@ bool Type_handler_decimal_result::
bool Type_handler_temporal_result::
Item_func_mul_fix_length_and_dec(Item_func_mul *item) const
{
item->fix_length_and_dec_temporal();
item->fix_length_and_dec_temporal(true);
return false;
}
@ -6294,7 +6294,7 @@ bool Type_handler_decimal_result::
bool Type_handler_temporal_result::
Item_func_div_fix_length_and_dec(Item_func_div *item) const
{
item->fix_length_and_dec_temporal();
item->fix_length_and_dec_temporal(false);
return false;
}
@ -6343,7 +6343,7 @@ bool Type_handler_decimal_result::
bool Type_handler_temporal_result::
Item_func_mod_fix_length_and_dec(Item_func_mod *item) const
{
item->fix_length_and_dec_temporal();
item->fix_length_and_dec_temporal(true);
return false;
}