database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge branch '10.5' into bb-10.6-release

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-03 10:47:52 +02:00
parent 212994f704 af143474d8
commit d2f1c3ed6c
449 changed files with 6842 additions and 2256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_type.cc
View File

@@ -4264,19 +4264,6 @@ 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
{