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

Fixes for last pull

Browse Source
This commit is contained in:
monty@mysql.com
2003-12-16 14:40:57 +02:00
parent 87f7fe5714
commit 30e318311b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/lib_sql.cc
View File

@ -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
*/ */

2
sql/field.cc
View File

@ -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;