mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
9dde418895
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
VC++Files/libmysql/libmysql.dsp:
new file: my_time.c
VC++Files/libmysqld/libmysqld.dsp:
new file: my_time.c
VC++Files/sql/mysqld.dsp:
new file: my_time.c
include/Makefile.am:
- mysql_time.h added to the list of installed client library headers
include/mysql.h:
- declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to
mysql_time.h, which is in shared use of client library and mysys.
libmysql/Makefile.shared:
- my_time.lo added to the list of libmysql objects
libmysql/libmysql.c:
Fix for bug#4030 "Client side conversion string -> date type doesn't work
(prepared statements)" and cleanup.
- added case labels for TIME/DATE/DATETIME types to send_data_str
- comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results.
libmysqld/Makefile.am:
- my_time.c added
sql-common/Makefile.am:
- my_time.c added to the list of files included into source distribution.
sql/Makefile.am:
my_time.c added to the list of mysqld sources.
sql/field.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item_timefunc.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/mysql_priv.h:
- added typedefs for TIME and timestamp_type
- removed declarations for str_to_time and str_to_TIME (now this functions
reside in mysys)
sql/mysqld.cc:
- log_10_int moved to mysys (it's used by str_to_TIME and str_to_time)
- enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
sql/set_var.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/set_var.h:
- fixed timestamp_type usage to be compatible with typedef.
sql/sql_prepare.cc:
- TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
- embedded library implementation of set_param_{time,date,datetime} is
much simplier now, as MYSQL_TIME is the same as TIME.
sql/sql_yacc.yy:
- s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc
sql/structs.h:
- declarations for TIME and timestamp_type replaced with typedefs
- str_to_datetime arguments moved to mysys headers
sql/time.cc:
- str_to_time and str_to_TIME moved to mysys
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now
exported to client.
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- str_to_TIME_with_warn renamed accordingly
sql/tztime.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
tests/client_test.c:
- a test case for Bug#4030 "Client side conversion string -> date type
doesn't work (prepared statements)"
103 lines
4.1 KiB
Text
103 lines
4.1 KiB
Text
## Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
##
|
|
## This library is free software; you can redistribute it and/or
|
|
## modify it under the terms of the GNU Library General Public
|
|
## License as published by the Free Software Foundation; either
|
|
## version 2 of the License, or (at your option) any later version.
|
|
##
|
|
## This library 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
|
|
## Library General Public License for more details.
|
|
##
|
|
## You should have received a copy of the GNU Library General Public
|
|
## License along with this library; if not, write to the Free
|
|
## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
## MA 02111-1307, USA
|
|
##
|
|
## This file is public domain and comes with NO WARRANTY of any kind
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded
|
|
## until someone complains that they need separate options.
|
|
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target)
|
|
pkglib_LTLIBRARIES = $(target)
|
|
|
|
noinst_PROGRAMS = conf_to_src
|
|
|
|
|
|
target_sources = libmysql.c password.c manager.c \
|
|
get_password.c errmsg.c
|
|
|
|
mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \
|
|
strmake.lo strend.lo strtod.lo \
|
|
strnlen.lo strfill.lo is_prefix.lo \
|
|
int2str.lo str2int.lo strinstr.lo strcont.lo \
|
|
strcend.lo bcmp.lo ctype-latin1.lo \
|
|
bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \
|
|
strtoull.lo strtoll.lo llstr.lo my_vsnprintf.lo \
|
|
ctype.lo ctype-simple.lo ctype-bin.lo ctype-mb.lo \
|
|
ctype-big5.lo ctype-czech.lo ctype-euc_kr.lo \
|
|
ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \
|
|
ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \
|
|
ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \
|
|
ctype-uca.lo xml.lo
|
|
|
|
mystringsextra= strto.c
|
|
dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo
|
|
mysysheaders = mysys_priv.h my_static.h
|
|
vioheaders = vio_priv.h
|
|
mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
|
|
my_create.lo my_delete.lo mf_tempfile.lo my_open.lo \
|
|
my_file.lo my_read.lo my_write.lo errors.lo \
|
|
my_error.lo my_getwd.lo my_div.lo \
|
|
mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\
|
|
mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \
|
|
mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \
|
|
my_symlink.lo my_fstream.lo \
|
|
mf_loadpath.lo my_pthread.lo my_thr_init.lo \
|
|
thr_mutex.lo mulalloc.lo string.lo default.lo \
|
|
my_compress.lo array.lo my_once.lo list.lo my_net.lo \
|
|
charset.lo charset-def.lo hash.lo mf_iocache.lo \
|
|
mf_iocache2.lo my_seek.lo my_sleep.lo \
|
|
my_pread.lo mf_cache.lo md5.lo sha1.lo\
|
|
my_getopt.lo my_gethostbyname.lo my_port.lo
|
|
sqlobjects = net.lo
|
|
sql_cmn_objects = pack.lo client.lo my_time.lo
|
|
|
|
# Not needed in the minimum library
|
|
mysysobjects2 = my_lib.lo
|
|
mysysobjects = $(mysysobjects1) $(mysysobjects2)
|
|
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \
|
|
$(sql_cmn_objects) $(vio_objects) $(sqlobjects)
|
|
target_ldflags = -version-info @SHARED_LIB_VERSION@
|
|
vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
|
|
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
|
|
$(target)
|
|
DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
|
|
|
|
# The automatic dependencies miss this
|
|
#bmove_upp.lo: $(LTCHARSET_OBJS)
|
|
|
|
clean-local:
|
|
rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
|
|
`echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
|
|
`echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
|
|
`echo $(vio_objects) | sed "s;\.lo;.c;g"` \
|
|
`echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \
|
|
$(CHARSET_SRCS) $(CHARSET_OBJS) \
|
|
$(mystringsextra) $(mysysheaders) $(vioheaders)\
|
|
../linked_client_sources net.c
|
|
|
|
conf_to_src_SOURCES = conf_to_src.c
|
|
conf_to_src_LDADD=
|
|
#force static linking of conf_to_src - essential when linking against
|
|
#custom installation of libc
|
|
conf_to_src_LDFLAGS=@NOINST_LDFLAGS@
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|