summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-06-24 19:08:36 +0400
committerkonstantin@mysql.com <>2004-06-24 19:08:36 +0400
commita30fcdc690955b883376fe56c099c97c944ab7c8 (patch)
tree51efbaacdacd9dad5c2745e3ccb58a3614f4f608 /libmysqld
parent3bcbdcb4061bbdf264c8b7d2ddd0cb7fb47fb8b4 (diff)
downloadmariadb-git-a30fcdc690955b883376fe56c099c97c944ab7c8.tar.gz
Fix for Bug#4030 "Client side conversion string -> date type doesn't
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.
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 58e11e4f297..226846c65d4 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -33,7 +33,8 @@ noinst_LIBRARIES = libmysqld_int.a
pkglib_LIBRARIES = libmysqld.a
SUBDIRS = . examples
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
-libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c
+libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
+ my_time.c
noinst_HEADERS = embedded_priv.h emb_qcache.h
@@ -56,7 +57,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
- spatial.cc gstream.cc sql_help.cc tztime.cc
+ spatial.cc gstream.cc sql_help.cc tztime.cc my_time.c
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
libmysqld_a_SOURCES=