diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-15 15:24:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-15 15:24:34 +0400 |
| commit | e9ca686137f0498cc1bc25d1c67fb32769d88218 (patch) | |
| tree | eb16367beb707e7f00d4d9afe1d31575b1e1f87e /sql/sql_time.cc | |
| parent | 3462b6d3d29eebc246dbf8942baffd0ae5dd0b4f (diff) | |
| download | mariadb-git-e9ca686137f0498cc1bc25d1c67fb32769d88218.tar.gz | |
MDEV-4871 Temporal literals do not accept nanoseconds
Diffstat (limited to 'sql/sql_time.cc')
| -rw-r--r-- | sql/sql_time.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index e2771d0500e..69f92b41ea4 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -311,7 +311,9 @@ str_to_datetime_with_warn(CHARSET_INFO *cs, THD *thd= current_thd; bool ret_val= str_to_datetime(cs, str, length, l_time, flags, &status); if (ret_val || status.warnings) - make_truncated_value_warning(thd, Sql_condition::WARN_LEVEL_WARN, + make_truncated_value_warning(thd, + ret_val ? Sql_condition::WARN_LEVEL_WARN : + Sql_condition::time_warn_level(status.warnings), str, length, flags & TIME_TIME_ONLY ? MYSQL_TIMESTAMP_TIME : l_time->time_type, NullS); DBUG_EXECUTE_IF("str_to_datetime_warn", |