database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-4858 Wrong results for a huge unsigned value inserted into a TIME column

Browse Source 
MDEV-6099 Bad results for DATE_ADD(.., INTERVAL 2000000000000000000.0 SECOND)
MDEV-6097 Inconsistent results for CAST(int,decimal,double AS DATETIME)
MDEV-6100 No warning on CAST(9000000 AS TIME)
This commit is contained in:
Alexander Barkov
2014-06-04 20:32:57 +04:00
parent a1975dd2c1
commit 661daf16f1
20 changed files with 194 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/field.cc
View File

@ -4664,7 +4664,7 @@ int Field_timestamp::store(longlong nr, bool unsigned_val)
{
MYSQL_TIME l_time;
int error;
Lazy_string_num str(nr);
Lazy_string_num str(nr, unsigned_val);
THD *thd= table->in_use;
/* We don't want to store invalid or fuzzy datetime values in TIMESTAMP */
@ -5067,6 +5067,17 @@ int Field_temporal::store_TIME_with_warning(MYSQL_TIME *ltime,
ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED;
#if MARIADB_VERSION_ID < 1000000
/*
Check if the YYYYMMDD part was truncated.
Translate a note into a warning.
In MariaDB-10.0 we have a better warnings/notes handling,
so this code is not needed.
*/
if (was_cut & MYSQL_TIME_NOTE_TRUNCATED)
was_cut|= MYSQL_TIME_WARN_TRUNCATED;
#endif
if (was_cut == 0 &&
have_smth_to_conv == 0 &&
temporal_type() != MYSQL_TIMESTAMP_TIME) // special case: zero date
@ -5157,7 +5168,7 @@ int Field_temporal::store(longlong nr, bool unsigned_val)
MYSQL_TIME ltime;
longlong tmp;
THD *thd= table->in_use;
Lazy_string_num str(nr);
Lazy_string_num str(nr, unsigned_val);
tmp= number_to_datetime(nr, 0, &ltime, (thd->variables.sql_mode &
(MODE_NO_ZERO_IN_DATE |
@ -5255,7 +5266,7 @@ int Field_time::store(double nr)
bool neg= nr < 0;
if (neg)
nr= -nr;
int have_smth_to_conv= !number_to_time(neg, (longlong)nr,
int have_smth_to_conv= !number_to_time(neg, (ulonglong) nr,
(ulong)((nr - floor(nr)) * TIME_SECOND_PART_FACTOR),
&ltime, &was_cut);
@ -5266,9 +5277,12 @@ int Field_time::store(double nr)
int Field_time::store(longlong nr, bool unsigned_val)
{
MYSQL_TIME ltime;
Lazy_string_num str(nr);
Lazy_string_num str(nr, unsigned_val);
int was_cut;
int have_smth_to_conv= !number_to_time(nr < 0, nr < 0 ? -nr : nr,
if (nr < 0 && unsigned_val)
nr= 99991231235959LL + 1;
int have_smth_to_conv= !number_to_time(nr < 0,
(ulonglong) (nr < 0 ? -nr : nr),
0, &ltime, &was_cut);
return store_TIME_with_warning(&ltime, &str, was_cut, have_smth_to_conv);
@ -5633,7 +5647,8 @@ bool Field_year::get_date(MYSQL_TIME *ltime,uint fuzzydate)
int tmp= (int) ptr[0];
if (tmp || field_length != 4)
tmp+= 1900;
return int_to_datetime_with_warn(tmp * 10000, ltime, fuzzydate, field_name);
return int_to_datetime_with_warn(false, tmp * 10000,
ltime, fuzzydate, field_name);
}