mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 00:54:30 +02:00
- COLUMN_CREATE(column_nr, value, [column_nr,value]...) - COLUMN_ADD(blob,column_nr, value, column_nr,value]...) - COLUMN_DELETE(blob, column_nr, column_nr...) - COLUMN_EXISTS(blob, column_nr) - COLUMN_LIST(blob, column_nr) - COLUMN_GET(string, column_nr AS type) Added cast(X as DOUBLE) and cast(x as INT) Better warning and error messages for wrong cast's Created some sub functions to simplify and reuse code. Added a lot of conversation functions with error/warnings for what went wrong. Fixed some issues when casting time to datetime. Added functions to dynamic strings and Strings to allow one to move a string buffer from dynamic strings to String (to save malloc+ copy) Added dynamic columns library to libmysqlclient include/Makefile.am: Added ma_dyncol.h include/decimal.h: Added 'const' to arguments for some functions. include/my_sys.h: Added dynstr_reassociate() include/my_time.h: Added TIME_SUBSECOND_RANGE Added double_to_datetime() Added flag argument to str_to_time() libmysql/CMakeLists.txt: Added mysys/ma_dyncol.c libmysql/Makefile.shared: Added ma_dyncol libmysql/libmysql.c: Added argument to str_to_time() mysql-test/r/bigint.result: Better error messages mysql-test/r/cast.result: Better warning and error messages A lot of new cast() tests mysql-test/r/func_math.result: Better warning messages mysql-test/r/func_str.result: Better warning messages mysql-test/r/func_time.result: Better warning messages mysql-test/r/sp-vars.result: Better warning messages mysql-test/r/strict.result: Better warning messages New test result mysql-test/r/type_newdecimal.result: Better warning messages mysql-test/r/warnings.result: Better warning messages mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated results after better cast warnings mysql-test/suite/funcs_1/r/memory_func_view.result: Updated results after better cast warnings mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated results after better cast warnings mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test: Added begin...commit to speed up test. mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc: Added begin...commit to speed up test. mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc: Added begin...commit to speed up test. mysql-test/suite/parts/r/part_supported_sql_func_innodb.result: Added begin...commit to speed up test. mysql-test/suite/parts/r/part_supported_sql_func_myisam.result: Added begin...commit to speed up test. mysql-test/suite/parts/r/rpl_partition.result: Added begin...commit to speed up test. mysql-test/suite/parts/t/part_supported_sql_func_innodb.test: Removed duplicated --big_test mysql-test/suite/parts/t/rpl_partition.test: Added begin...commit to speed up test. mysql-test/suite/pbxt/r/cast.result: Updated results after better cast warnings mysql-test/suite/pbxt/r/func_str.result: Updated results after better cast warnings mysql-test/suite/pbxt/r/type_newdecimal.result: Updated results after better cast warnings mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Added begin...commit to speed up test. mysql-test/suite/rpl/t/rpl_innodb_bug28430.test: Added begin...commit to speed up test. mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result: More warnings mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result: More warnings mysql-test/t/cast.test: A lot of new cast() tests mysql-test/t/strict.test: Added new test mysys/CMakeLists.txt: Added ma_dyncol.c mysys/Makefile.am: Added ma_dyncol.c mysys/string.c: Added dynstr_reassociate() to move a buffer from dynamic_strings to some other allocator sql-common/my_time.c: Added 'fuzzydate' flag to str_to_time() Added support for microseconds to my_time_to_str() and my_datetime_to_str() Reset second_parts in number_to_datetime() Added double_to_datetime() sql/field.cc: Added double_to_longlong() and truncate_double() to simplify and reuse code sql/field.h: New prototypes sql/item.cc: Changed Item::get_date(MYSQL_TIME *ltime,uint fuzzydate) to be aware of type of argument. (Needed to make it microsecond safe and get better warnings). Updated call to str_to_time_with_warn() sql/item.h: Added struct st_dyncall_create_def used by dynamic columns Added virtual bool dynamic_result() to tell if type of argument may change over calls. sql/item_cmpfunc.cc: Added Item_func_dyncol_exists() sql/item_cmpfunc.h: Added class Item_func_dyncol_exists sql/item_create.cc: Added get_length_and_scale() to simplify other functions Simplified and extended create_func_cast() Added support for cast(X as double(X,Y)) Added functions to create dynamic column functions. sql/item_create.h: Added prototypes sql/item_func.cc: Extended cast functions Item_func_signed() and Item_func_unsigned() to work with dynamic types Added Item_double_typecast() sql/item_func.h: Added class Item_double_typecast() sql/item_strfunc.cc: Added functions for COLUMN_CREATE(), COLUMN_ADD(), COLUMN_GET() and COLUMN_LIST() sql/item_strfunc.h: Added classes for COLUMN_CREATE(), COLUMN_ADD(), COLUMN_GET() and COLUMN_LIST() sql/item_timefunc.cc: Added flag argument to str_to_time_with_warn() Updated Item_char_typecast() to handle result type that may change between calls (for dynamic columns) Added Item_time_typecast::get_date() to ensure that we cast a datetime to time properly. sql/item_timefunc.h: Added get_date() to Item_time_typecast() to allow proper results for casting time to datetime sql/lex.h: Added new SQL function names sql/my_decimal.cc: Added 'const' to some arguments. Better error message in case of errors (we now print out the wrong value) Added my_decimal2int() sql/my_decimal.h: Moved some constants to my_decimal_limits.h Updated prototypes. Made my_decimal2int() a function as it's rather long (no reason to have it inline) Added decimal2my_decimal() function. sql/mysql_priv.h: Prototypes for new functions sql/share/errmsg.txt: New error messages for wrong casts and dynamic columns sql/sql_acl.cc: Fixed indentation sql/sql_base.cc: Added dynamic_column_error_message() sql/sql_string.h: Added reassociate() to move a buffer to be owned by String object. sql/sql_yacc.yy: Added syntax for COLUMN_ functions. sql/time.cc: Updated str_to_datetime_with_warn() flag argument to same type as other functions Added conversion flag to str_to_time_with_warn() (Similar to all datetime functions) Added conversion functions with warnings: double_to_datetime_with_warn() and decimal_to_datetime_with_warn() strings/decimal.c: Added 'const' to arguments for some functions. unittest/mysys/Makefile.am: Added test for dynamic columns code
155 lines
6.1 KiB
Makefile
155 lines
6.1 KiB
Makefile
# Copyright (C) 2000-2006 MySQL AB, 2009 Sun Microsystems, Inc.
|
|
#
|
|
# 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; version 2 of the License.
|
|
#
|
|
# 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
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
|
|
-I$(top_srcdir)/include -I$(srcdir)
|
|
pkglib_LIBRARIES = libmysys.a
|
|
noinst_LTLIBRARIES = libmysys.la
|
|
LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a
|
|
noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h \
|
|
my_safehash.h
|
|
libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
|
|
mf_path.c mf_loadpath.c my_file.c \
|
|
my_open.c my_create.c my_dup.c my_seek.c my_read.c \
|
|
my_pread.c my_write.c my_getpagesize.c \
|
|
my_crc32.c ma_dyncol.c \
|
|
mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \
|
|
mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \
|
|
my_malloc.c my_realloc.c my_once.c mulalloc.c \
|
|
my_alloc.c safemalloc.c my_new.cc \
|
|
my_vle.c my_atomic.c \
|
|
my_safehash.c lf_hash.c lf_dynarray.c lf_alloc-pin.c \
|
|
my_rnd.c my_uuid.c my_chmod.c \
|
|
my_fopen.c my_fstream.c my_getsystime.c \
|
|
my_error.c errors.c my_div.c my_messnc.c \
|
|
mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \
|
|
my_symlink.c my_symlink2.c \
|
|
mf_pack.c mf_unixpath.c mf_arr_appstr.c \
|
|
mf_wcomp.c mf_wfile.c my_gethwaddr.c \
|
|
mf_qsort.c mf_qsort2.c mf_sort.c \
|
|
ptr_cmp.c mf_radix.c queues.c my_getncpus.c \
|
|
tree.c trie.c list.c hash.c array.c string.c typelib.c \
|
|
my_copy.c my_append.c my_lib.c \
|
|
my_delete.c my_rename.c my_redel.c \
|
|
my_chsize.c my_clock.c \
|
|
my_quick.c my_lockmem.c my_static.c \
|
|
my_sync.c my_getopt.c my_mkdir.c \
|
|
default_modify.c default.c \
|
|
my_compress.c checksum.c \
|
|
my_net.c my_port.c my_sleep.c \
|
|
charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
|
|
my_gethostbyname.c rijndael.c my_aes.c sha1.c \
|
|
my_handler.c my_netware.c my_largepage.c \
|
|
my_memmem.c stacktrace.c \
|
|
my_windac.c my_access.c base64.c my_libwrap.c \
|
|
wqueue.c
|
|
libmysys_la_LDFLAGS = $(AM_LDFLAGS) @WRAPLIBS@
|
|
libmysys_la_LIBADD = $(ZLIB_LIBS)
|
|
|
|
if NEED_THREAD
|
|
# mf_keycache is used only in the server, so it is safe to leave the file
|
|
# out of the non-threaded library.
|
|
# In fact, it will currently not compile without thread support.
|
|
libmysys_la_SOURCES += thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c \
|
|
my_pthread.c my_thr_init.c waiting_threads.c \
|
|
mf_keycache.c mf_keycaches.c
|
|
endif
|
|
|
|
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
|
|
thr_mutex.c thr_rwlock.c waiting_threads.c \
|
|
CMakeLists.txt mf_soundex.c \
|
|
my_conio.c my_wincond.c my_winthread.c
|
|
# test_dir_DEPENDENCIES= $(LIBRARIES)
|
|
# testhash_DEPENDENCIES= $(LIBRARIES)
|
|
# test_charset_DEPENDENCIES= $(LIBRARIES)
|
|
# charset2html_DEPENDENCIES= $(LIBRARIES)
|
|
DEFS = -DDEFAULT_BASEDIR='"$(prefix)"' \
|
|
-DMYSQL_DATADIR='"$(MYSQLDATAdir)"' \
|
|
-DDEFAULT_CHARSET_HOME='"$(MYSQLBASEdir)"' \
|
|
-DSHAREDIR'="$(MYSQLSHAREdir)"' \
|
|
-DDEFAULT_HOME_ENV=MYSQL_HOME \
|
|
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
|
|
-DDEFAULT_SYSCONFDIR='"$(sysconfdir)"' \
|
|
@DEFS@
|
|
|
|
# I hope this always does the right thing. Otherwise this is only test programs
|
|
FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
|
|
|
|
CLEANFILES = test_bitmap$(EXEEXT) test_priority_queue$(EXEEXT) \
|
|
test_thr_alarm$(EXEEXT) test_thr_lock$(EXEEXT) \
|
|
test_vsnprintf$(EXEEXT) test_io_cache$(EXEEXT) \
|
|
test_dir$(EXEEXT) test_charset$(EXEEXT) \
|
|
testhash$(EXEEXT) test_gethwaddr$(EXEEXT) \
|
|
test_base64$(EXEEXT) test_thr_mutex$(EXEEXT)
|
|
|
|
libmysys_a_SOURCES=
|
|
libmysys.a: libmysys.la
|
|
$(CP) .libs/libmysys.a $@
|
|
|
|
#
|
|
# The CP .. RM stuff is to avoid problems with some compilers (like alpha ccc)
|
|
# which automaticly removes the object files you use to compile a final program
|
|
#
|
|
|
|
test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN ./my_bitmap.c $(LDADD) $(LIBS)
|
|
|
|
test_priority_queue$(EXEEXT): queues.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN ./queues.c $(LDADD) $(LIBS)
|
|
|
|
test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_thr_alarm.c
|
|
|
|
test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_thr_lock.c
|
|
|
|
test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
|
|
$(RM) -f test_vsnprintf.c
|
|
|
|
test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/mf_iocache.c test_io_cache.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
|
|
$(RM) -f test_io_cache.c
|
|
|
|
test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
|
|
|
|
test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
|
|
|
|
testhash$(EXEEXT): testhash.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
|
|
|
|
test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_gethwaddr.c
|
|
|
|
test_base64$(EXEEXT): base64.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/base64.c ./test_base64.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_base64.c
|
|
|
|
test_thr_mutex$(EXEEXT): test_thr_mutex.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) $(srcdir)/test_thr_mutex.c $(LDADD) $(LIBS)
|