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 commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4

Browse Source
This commit is contained in:
Alexander Barkov
2019-08-13 11:42:31 +04:00
parent ae1d17f52d 43882e764d
commit 95cdc1ca5f
67 changed files with 986 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_type.h
View File

@ -4100,10 +4100,6 @@ public:
*/
class Type_handler_numeric: public Type_handler
{
protected:
bool Item_sum_hybrid_fix_length_and_dec_numeric(Item_sum_hybrid *func,
const Type_handler *handler)
const;
public:
String *print_item_value(THD *thd, Item *item, String *str) const;
double Item_func_min_max_val_real(Item_func_min_max *) const;
@ -6322,10 +6318,6 @@ public:
{
return (m_type_handler= Type_handler::get_handler_by_result_type(type));
}
const Type_handler *set_handler_by_cmp_type(Item_result type)
{
return (m_type_handler= Type_handler::get_handler_by_cmp_type(type));
}
const Type_handler *set_handler_by_result_type(Item_result type,
uint max_octet_length,
CHARSET_INFO *cs)