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.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-02-25 18:19:55 +01:00
parent 0485328d03 0251232f8c
commit 00d1db7a38
372 changed files with 10986 additions and 4523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_type.cc
View File

@ -433,10 +433,8 @@ Field *Type_handler_timestamp::make_conversion_table_field(TABLE *table,
const Field *target)
const
{
// We assume TIMESTAMP(0)
return new(table->in_use->mem_root)
Field_timestamp(NULL, MAX_DATETIME_WIDTH, (uchar *) "", 1,
Field::NONE, TMPNAME, table->s);
return new_Field_timestamp(table->in_use->mem_root, NULL, (uchar *) "", 1,
Field::NONE, TMPNAME, table->s, target->decimals());
}
@ -476,9 +474,8 @@ Field *Type_handler_time::make_conversion_table_field(TABLE *table,
const Field *target)
const
{
return new(table->in_use->mem_root)
Field_time(NULL, MAX_TIME_WIDTH, (uchar *) "", 1,
Field::NONE, TMPNAME);
return new_Field_time(table->in_use->mem_root, NULL, (uchar *) "", 1,
Field::NONE, TMPNAME, target->decimals());
}
@ -497,9 +494,8 @@ Field *Type_handler_datetime::make_conversion_table_field(TABLE *table,
const Field *target)
const
{
return new(table->in_use->mem_root)
Field_datetime(NULL, MAX_DATETIME_WIDTH, (uchar *) "", 1,
Field::NONE, TMPNAME);
return new_Field_datetime(table->in_use->mem_root, NULL, (uchar *) "", 1,
Field::NONE, TMPNAME, target->decimals());
}