mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixes for last pull
libmysqld/lib_sql.cc: Fixed compilation error in embedded library (from last pull) sql/field.cc: Safer timestamp year checking (as 1969 can be in timestamp)
This commit is contained in:
@ -277,6 +277,12 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void THD::clear_error()
|
||||||
|
{
|
||||||
|
net.last_error[0]= 0;
|
||||||
|
net.last_errno= 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Make a copy of array and the strings array points to
|
Make a copy of array and the strings array points to
|
||||||
*/
|
*/
|
||||||
|
@ -2589,7 +2589,7 @@ void Field_timestamp::store(longlong nr)
|
|||||||
{
|
{
|
||||||
long not_used;
|
long not_used;
|
||||||
|
|
||||||
if (l_time.year >= TIMESTAMP_MAX_YEAR || l_time.year < 1900+YY_PART_YEAR)
|
if (l_time.year >= TIMESTAMP_MAX_YEAR || l_time.year < 1900+YY_PART_YEAR-1)
|
||||||
{
|
{
|
||||||
current_thd->cuted_fields++;
|
current_thd->cuted_fields++;
|
||||||
timestamp=0;
|
timestamp=0;
|
||||||
|
Reference in New Issue
Block a user