mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
7845f99abf
fixes. Still to do:
- deploy my_strtoll10 in limbysql.c
- add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.
include/my_time.h:
More calls are shared between client and server (libmysql now performs
more intelligent date->number and number->date conversions).
TODO: rename those which are not starting with 'my_'
include/mysql.h:
MYSQL_BIND:
- more elaborated comment
- some of the ex-private members were given public names -
it's sometimes convenient to set bind->error to &bind->error_value.
However Monty questions the idea, so it should be given
more thought in future.
- added new members to support data truncation.
Added new return value of mysql_stmt_fetch, MYSQL_DATA_TRUNCATED.
libmysql/libmysql.c:
- added support for data truncation during fetch
- implementation for is_binary_compatible: now conversion functions
are used less frequently
- we now use number_to_datetime and TIME_to_ulonglong for date->number and
number->date conversions
sql-common/my_time.c:
- added implementation of date->number and number->date calls shared
between client and server (moved from time.cc).
sql/field.cc:
- implemented Field_time::store_time() to better support date->time
conversions in prepared mode. After-review fixes.
sql/field.h:
- Field::store_time now returns int
sql/mysql_priv.h:
- removed date->number and number->date conversion functions headers
(moved to my_time.h)
sql/time.cc:
- removed implementation of date->number and number->date conversion
functions (moved to my_time.c)
tests/client_test.c:
- added a test case for data truncation; other test cases adjusted.
- fixed my_process_stmt_result to set STMT_ATTR_UPDATE_MAX_LENGTH (tables
are now printed out prettier).
93 lines
3.1 KiB
C
93 lines
3.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 */
|
|
|
|
/*
|
|
This is a private header of sql-common library, containing
|
|
declarations for my_time.c
|
|
*/
|
|
|
|
#ifndef _my_time_h_
|
|
#define _my_time_h_
|
|
#include "my_global.h"
|
|
#include "mysql_time.h"
|
|
|
|
C_MODE_START
|
|
|
|
extern ulonglong log_10_int[20];
|
|
extern uchar days_in_month[];
|
|
|
|
/*
|
|
Portable time_t replacement.
|
|
Should be signed and hold seconds for 1902-2038 range.
|
|
*/
|
|
typedef long my_time_t;
|
|
|
|
#define MY_TIME_T_MAX LONG_MAX
|
|
#define MY_TIME_T_MIN LONG_MIN
|
|
|
|
#define YY_PART_YEAR 70
|
|
|
|
/* Flags to str_to_datetime */
|
|
#define TIME_FUZZY_DATE 1
|
|
#define TIME_DATETIME_ONLY 2
|
|
/* Must be same as MODE_NO_ZERO_IN_DATE */
|
|
#define TIME_NO_ZERO_IN_DATE (65536L*2*2*2*2*2*2*2)
|
|
/* Must be same as MODE_NO_ZERO_DATE */
|
|
#define TIME_NO_ZERO_DATE (TIME_NO_ZERO_IN_DATE*2)
|
|
#define TIME_INVALID_DATES (TIME_NO_ZERO_DATE*2)
|
|
|
|
enum enum_mysql_timestamp_type
|
|
str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
|
|
uint flags, int *was_cut);
|
|
longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
|
|
my_bool fuzzy_date, int *was_cut);
|
|
ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *time);
|
|
ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *time);
|
|
ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time);
|
|
ulonglong TIME_to_ulonglong(const MYSQL_TIME *time);
|
|
|
|
|
|
bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
|
|
int *was_cut);
|
|
|
|
long calc_daynr(uint year,uint month,uint day);
|
|
uint calc_days_in_year(uint year);
|
|
|
|
void init_time(void);
|
|
|
|
my_time_t
|
|
my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, bool *in_dst_time_gap);
|
|
|
|
void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type);
|
|
|
|
/*
|
|
Required buffer length for my_time_to_str, my_date_to_str,
|
|
my_datetime_to_str and TIME_to_string functions. Note, that the
|
|
caller is still responsible to check that given TIME structure
|
|
has values in valid ranges, otherwise size of the buffer could
|
|
be not enough. We also rely on the fact that even wrong values
|
|
sent using binary protocol fit in this buffer.
|
|
*/
|
|
#define MAX_DATE_STRING_REP_LENGTH 30
|
|
|
|
int my_time_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_date_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_datetime_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_TIME_to_str(const MYSQL_TIME *l_time, char *to);
|
|
|
|
C_MODE_END
|
|
|
|
#endif /* _my_time_h_ */
|