mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-27 02:35:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-4871 Temporal literals do not accept nanoseconds

Browse source
This commit is contained in:
Alexander Barkov 2013-08-15 15:24:34 +04:00
commit e9ca686137
11 changed files with 156 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sql/item_create.cc
View file

@ -5796,6 +5796,13 @@ create_func_cast(THD *thd, Item *a, Cast_target cast_type,
}
static bool
have_important_literal_warnings(const MYSQL_TIME_STATUS *status)
{
return (status->warnings & ~MYSQL_TIME_NOTE_TRUNCATED) != 0;
}
/**
Builder for datetime literals:
TIME'00:00:00', DATE'2001-01-01', TIMESTAMP'2001-01-01 00:00:00'.
@ -5827,13 +5834,15 @@ Item *create_temporal_literal(THD *thd,
break;
case MYSQL_TYPE_DATETIME:
if (!str_to_datetime(cs, str, length, &ltime, flags, &status) &&
ltime.time_type == MYSQL_TIMESTAMP_DATETIME && !status.warnings)
ltime.time_type == MYSQL_TIMESTAMP_DATETIME &&
!have_important_literal_warnings(&status))
item= new (thd->mem_root) Item_datetime_literal(&ltime,
status.precision);
break;
case MYSQL_TYPE_TIME:
if (!str_to_time(cs, str, length, &ltime, 0, &status) &&
ltime.time_type == MYSQL_TIMESTAMP_TIME && !status.warnings)
ltime.time_type == MYSQL_TIMESTAMP_TIME &&
!have_important_literal_warnings(&status))
item= new (thd->mem_root) Item_time_literal(&ltime,
status.precision);
break;
@ -5842,7 +5851,16 @@ Item *create_temporal_literal(THD *thd,
}
if (item)
{
if (status.warnings) // e.g. a note on nanosecond truncation
{
ErrConvString err(str, length, cs);
make_truncated_value_warning(current_thd,
Sql_condition::time_warn_level(status.warnings),
&err, ltime.time_type, 0);
}
return item;
}
if (send_error)
{