mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
cef1d75249
Speed up column-completion in 'mysql' Don't use ISAM if HAVE_ISAM is not defined A lot of fixes for the embedded version. All libraries are now included in libmysqld.a Changed arguments to convert_dirname() to make it more general. Renamed files in the 'merge' directory to all use a common prefix. Don't compile both assembler and C functions on x86 BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7: Delete: mysys/mf_pack2.c Docs/manual.texi: Updated chapter about embedded version acinclude.m4: Fix for using BDB and InnoDB with embedded client/completion_hash.cc: Speed up memory allocation client/completion_hash.h: Speed up memory allocation client/mysql.cc: Speed up memory allocation client/mysqldump.c: Fix to use now convert_dirname client/mysqltest.c: Fixed memory allocation bugs. Added --basedir=#, --compress=#, --server-arg, --server-file. Fixes for embedded version Changed silent mode to -s instead of -q include/my_global.h: Update to use HAVE_ISAM include/my_sys.h: Cleanup of fn_format() include/mysql.h: Prepare FIELD struct for 4.1 include/mysql_embed.h: Don't use ISAM in embedded version innobase/include/srv0srv.h: Make InnoDB startup/shutdown silent in embedded version innobase/log/log0log.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0srv.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0start.c: Make InnoDB startup/shutdown silent in embedded version isam/isamlog.c: new convert_dirname libmysql/libmysql.c: Prepare for 4.1 libmysqld/Makefile.am: Changed to create one libmysqld.a file that includes all other libraries. libmysqld/examples/Makefile.am: Changed to use new libmysqld.a libmysqld/examples/test-run: Lot's of fixes to get new mysqltest with embedded MySQL to work. libmysqld/lib_sql.cc: Changed type of arguments for mysql_server_init() to make code more portable. libmysqld/libmysqld.c: Cleanup merge/Makefile.am: Rename to use common prefix. merge/mrg_close.c: Rename to use common prefix. merge/mrg_create.c: Rename to use common prefix. merge/mrg_def.h: Rename to use common prefix. merge/mrg_delete.c: Rename to use common prefix. merge/mrg_extra.c: Rename to use common prefix. merge/mrg_info.c: Rename to use common prefix. merge/mrg_locking.c: Rename to use common prefix. merge/mrg_open.c: Rename to use common prefix. merge/mrg_panic.c: Rename to use common prefix. merge/mrg_rrnd.c: Rename to use common prefix. merge/mrg_rsame.c: Rename to use common prefix. merge/mrg_static.c: Rename to use common prefix. merge/mrg_update.c: Rename to use common prefix. myisam/myisamlog.c: Use new convert_dirname myisammrg/Makefile.am: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_close.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_create.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_def.h: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_delete.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_extra.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_info.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_locking.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_open.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_panic.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_queue.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rfirst.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rkey.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rlast.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rnext.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rprev.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rrnd.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rsame.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_static.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_update.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_write.c: Renamed mymrgdef.h -> myrg_def.h mysql-test/include/master-slave.inc: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/mysql-test-run.sh: cleanup mysql-test/r/auto_increment.result: Cleanup of tests for embedded version mysql-test/r/func_system.result: Cleanup of tests for embedded version mysql-test/r/isam.result: Cleanup of tests for embedded version mysql-test/r/lock.result: Cleanup of tests for embedded version mysql-test/r/show_check.result: Cleanup of tests for embedded version mysql-test/t/auto_increment.test: Cleanup of tests for embedded version mysql-test/t/backup.test: Cleanup of tests for embedded version mysql-test/t/count_distinct2-master.opt: Cleanup of tests for embedded version mysql-test/t/count_distinct2.test: Cleanup of tests for embedded version mysql-test/t/create.test: Cleanup of tests for embedded version mysql-test/t/flush.test: Cleanup of tests for embedded version mysql-test/t/func_system.test: Cleanup of tests for embedded version mysql-test/t/isam.test: Cleanup of tests for embedded version mysql-test/t/kill.test: Cleanup of tests for embedded version mysql-test/t/lock.test: Cleanup of tests for embedded version mysql-test/t/order_fill_sortbuf-master.opt: Cleanup of tests for embedded version mysql-test/t/rpl000015.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000016.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000017.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000018.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/show_check.test: Move ISAM specific tests to isam.test mysql-test/t/status.test: Cleanup of tests for embedded version mysql-test/t/tablelock.test: Cleanup mysys/Makefile.am: Removed not used mf_pack2.c mysys/charset.c: new convert_dirname mysys/default.c: new convert_dirname mysys/mf_dirname.c: Changed convert_dirname() to be more general mysys/mf_format.c: Changed bit flags to fn_format() to defines. Added handling of relative filenames BitKeeper/etc/ignore: Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list mysys/mf_pack.c: new convert_dirname mysys/mf_tempfile.c: new convert_dirname scripts/Makefile.am: Adde mysql_explain_log scripts/mysql_config.sh: Added support of --libmysqld-libs sql/Makefile.am: Fix to use 'innodb_system_libs' sql/ha_innobase.cc: Make InnoDB startup/shutdown silent in embedded version sql/ha_isam.cc: Added handling of HAVE_ISAM sql/ha_isammrg.cc: Added handling of HAVE_ISAM sql/ha_myisam.cc: Handle relative paths; Needed to support BACKUP TABLE in embedded version sql/ha_myisammrg.cc: Rename of filenames sql/handler.cc: Added handling of HAVE_ISAM sql/item_func.cc: Fix for ecc (Intel Compiler) sql/mysql_priv.h: Added global variable 'mysql_embedded' sql/mysqld.cc: Use HAVE_ISAM sql/sql_parse.cc: Use new convert_dirname sql/sql_select.cc: Fix for ecc (Intel Compiler) sql/sql_table.cc: Added handling of relative filenames strings/Makefile.am: Don't compile both assembler and C functions on x86 strings/bchange.c: cleanup
109 lines
4.4 KiB
Makefile
109 lines
4.4 KiB
Makefile
# Copyright (C) 2000 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
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. -I$(srcdir)
|
|
pkglib_LIBRARIES = libmysys.a
|
|
LDADD = libmysys.a ../dbug/libdbug.a \
|
|
../strings/libmystrings.a
|
|
noinst_HEADERS = mysys_priv.h my_static.h
|
|
libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\
|
|
mf_path.c mf_loadpath.c\
|
|
my_open.c my_create.c my_dup.c my_seek.c my_read.c \
|
|
my_pread.c my_write.c \
|
|
mf_keycache.c \
|
|
mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.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_fopen.c my_fstream.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_stripp.c \
|
|
mf_casecnv.c mf_soundex.c mf_wcomp.c mf_wfile.c \
|
|
mf_qsort.c mf_qsort2.c mf_sort.c \
|
|
ptr_cmp.c mf_radix.c queues.c \
|
|
tree.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_tempnam.c \
|
|
my_chsize.c my_lread.c my_lwrite.c my_clock.c \
|
|
my_quick.c my_lockmem.c my_static.c \
|
|
getopt.c getopt1.c getvar.c my_mkdir.c \
|
|
default.c my_compress.c checksum.c raid.cc my_net.c \
|
|
my_vsnprintf.c charset.c my_bitmap.c my_bit.c
|
|
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
|
|
thr_mutex.c thr_rwlock.c
|
|
libmysys_a_LIBADD = @THREAD_LOBJECTS@
|
|
# test_fn removed 980815 since it not upp to date test_dir
|
|
noinst_PROGRAMS = test_charset @THREAD_LPROGRAMS@
|
|
# test_dir_DEPENDENCIES= $(LIBRARIES)
|
|
# testhash_DEPENDENCIES= $(LIBRARIES)
|
|
test_charset_DEPENDENCIES= $(LIBRARIES)
|
|
EXTRA_PROGRAMS =
|
|
DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
|
@DEFS@
|
|
|
|
libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
|
|
|
|
OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
|
|
__math.h time.h __time.h unistd.h __unistd.h types.h \
|
|
xtypes.h ac-types.h posix.h string.h __string.h \
|
|
errno.h socket.h inet.h dirent.h netdb.h \
|
|
cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
|
|
prio_queue.h pthread_attr.h pthread_once.h queue.h\
|
|
sleep.h specific.h version.h pwd.h timers.h uio.h \
|
|
cdefs.h machdep.h signal.h __signal.h util.h
|
|
|
|
# I hope this always does the right thing. Otherwise this is only test programs
|
|
FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
|
|
|
|
#
|
|
# 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_thr_alarm: 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.*
|
|
|
|
test_thr_lock: 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.*
|
|
|
|
test_vsnprintf: my_vsnprintf.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
|
|
$(RM) -f test_vsnprintf.*
|
|
|
|
test_dir: test_dir.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
|
|
|
|
test_charset: test_charset.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
|
|
|
|
testhash: testhash.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|