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

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-04 17:24:15 +02:00
parent bbd70fcc43 9a156e1a23
commit 48b5777ebd
144 changed files with 3475 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sql/sql_type.cc
View File

@ -186,6 +186,12 @@ bool Type_handler_data::init()
}
Schema *Type_handler::schema() const
{
return &mariadb_schema;
}
const Type_handler *
Type_handler::handler_by_name(THD *thd, const LEX_CSTRING &name)
{
@ -4134,6 +4140,19 @@ void Type_handler_temporal_with_date::Item_update_null_value(Item *item) const
(void) item->get_date(thd, &ltime, Datetime::Options(thd));
}
bool
Type_handler_timestamp_common::
Column_definition_set_attributes(THD *thd,
Column_definition *def,
const Lex_field_type_st &attr,
CHARSET_INFO *cs,
column_definition_type_t type) const
{
Type_handler::Column_definition_set_attributes(thd, def, attr, cs, type);
if (!opt_explicit_defaults_for_timestamp)
def->flags|= NOT_NULL_FLAG;
return false;
}
void Type_handler_string_result::Item_update_null_value(Item *item) const
{
@ -6165,7 +6184,8 @@ bool Type_handler_row::
bool Type_handler_int_result::
Item_func_round_fix_length_and_dec(Item_func_round *item) const
{
item->fix_arg_int(this, item->arguments()[0]);
item->fix_arg_int(this, item->arguments()[0],
field_type() == MYSQL_TYPE_LONGLONG);
return false;
}
@ -6173,7 +6193,7 @@ bool Type_handler_int_result::
bool Type_handler_year::
Item_func_round_fix_length_and_dec(Item_func_round *item) const
{
item->fix_arg_int(&type_handler_ulong, item->arguments()[0]);
item->fix_arg_int(&type_handler_ulong, item->arguments()[0], false);
return false;
}
@ -6181,7 +6201,7 @@ bool Type_handler_year::
bool Type_handler_hex_hybrid::
Item_func_round_fix_length_and_dec(Item_func_round *item) const
{
item->fix_arg_int(nullptr, nullptr);
item->fix_arg_hex_hybrid();
return false;
}
@ -6224,7 +6244,7 @@ bool Type_handler_date_common::
{
static const Type_std_attributes attr(Type_numeric_attributes(8, 0, true),
DTCollation_numeric());
item->fix_arg_int(&type_handler_ulong, &attr);
item->fix_arg_int(&type_handler_ulong, &attr, false);
return false;
}