mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
5d9f7edd6d
In server we assume that datetime values stored in MYSQL_TIME struct are normalized (and year is not greater than 9999), so we should perform range checks in all places then we convert something to MYSQL_TIME. include/my_time.h: Added one more argument to set_zero_time() function to make it more convinient. Added comment clarifying why MAX_DATE_STRING_REP_LENGTH value is 30. include/mysql_time.h: Documented MySQL's internal assumptions for members of MYSQL_TIME structure. libmysql/libmysql.c: It does not make sense to set MYSQL_TIME::time_type twice in case of errors. mysql-test/r/type_datetime.result: Added test for bug #6266 "Invalid DATETIME value not handled properly". mysql-test/t/type_datetime.test: Added test for bug #6266 "Invalid DATETIME value not handled properly". sql-common/my_time.c: str_to_datetime(): Added missing check for too big year values. set_zero_time(): added time_type argument, since MYSQL_TIMESTAMP_NONE is not the value that we want in most cases. sql/field.cc: Field_datetime::store_time(): clarified why we don't perform any range checks here. sql/item.cc: Item_param::set_time(): Added comment describing this method and range checking for TIME values. sql/sql_prepare.cc: Removed comments about range checking for TIME values in prepared statements, which are no longer true. set_zero_time() has one more argument now. tests/client_test.c: Added test for bug #6266 "Invalid DATETIME value not handled properly"
56 lines
2.1 KiB
C
56 lines
2.1 KiB
C
/* Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef _mysql_time_h_
|
|
#define _mysql_time_h_
|
|
|
|
/*
|
|
Time declarations shared between the server and client API:
|
|
you should not add anything to this header unless it's used
|
|
(and hence should be visible) in mysql.h.
|
|
If you're looking for a place to add new time-related declaration,
|
|
it's most likely my_time.h. See also "C API Handling of Date
|
|
and Time Values" chapter in documentation.
|
|
*/
|
|
|
|
enum enum_mysql_timestamp_type
|
|
{
|
|
MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
|
|
MYSQL_TIMESTAMP_DATE= 0, MYSQL_TIMESTAMP_DATETIME= 1, MYSQL_TIMESTAMP_TIME= 2
|
|
};
|
|
|
|
|
|
/*
|
|
Structure which is used to represent datetime values inside MySQL.
|
|
|
|
We assume that values in this structure are normalized, i.e. year <= 9999,
|
|
month <= 12, day <= 31, hour <= 23, hour <= 59, hour <= 59. Many functions
|
|
in server such as my_system_gmt_sec() or make_time() family of functions
|
|
rely on this (actually now usage of make_*() family relies on a bit weaker
|
|
restriction). Also functions that produce MYSQL_TIME as result ensure this.
|
|
There is one exception to this rule though if this structure holds time
|
|
value (time_type == MYSQL_TIMESTAMP_TIME) days and hour member can hold
|
|
bigger values.
|
|
*/
|
|
typedef struct st_mysql_time
|
|
{
|
|
unsigned int year, month, day, hour, minute, second;
|
|
unsigned long second_part;
|
|
my_bool neg;
|
|
enum enum_mysql_timestamp_type time_type;
|
|
} MYSQL_TIME;
|
|
|
|
#endif /* _mysql_time_h_ */
|