mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
172 lines
6.7 KiB
Makefile
172 lines
6.7 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
|
|
|
|
#called from the top level Makefile
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
INCLUDES = @ZLIB_INCLUDES@ \
|
|
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
|
|
-I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
-I$(top_srcdir)/regex -I$(srcdir) \
|
|
$(openssl_includes)
|
|
WRAPLIBS= @WRAPLIBS@
|
|
SUBDIRS = share
|
|
libexec_PROGRAMS = mysqld
|
|
EXTRA_PROGRAMS = gen_lex_hash
|
|
bin_PROGRAMS = mysql_tzinfo_to_sql
|
|
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
|
|
LDADD = $(top_builddir)/myisam/libmyisam.a \
|
|
$(top_builddir)/myisammrg/libmyisammrg.a \
|
|
$(top_builddir)/heap/libheap.a \
|
|
$(top_builddir)/vio/libvio.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/regex/libregex.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
|
|
|
|
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
|
|
@bdb_libs@ @innodb_libs@ @pstack_libs@ \
|
|
@innodb_system_libs@ \
|
|
@ndbcluster_libs@ @ndbcluster_system_libs@ \
|
|
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
|
|
@yassl_libs@ @openssl_libs@
|
|
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
|
|
item_strfunc.h item_timefunc.h item_uniq.h \
|
|
item_create.h item_subselect.h item_row.h \
|
|
mysql_priv.h item_geofunc.h sql_bitmap.h \
|
|
procedure.h sql_class.h sql_lex.h sql_list.h \
|
|
sql_manager.h sql_map.h sql_string.h unireg.h \
|
|
sql_error.h field.h handler.h mysqld_suffix.h \
|
|
ha_myisammrg.h\
|
|
ha_heap.h ha_myisam.h ha_berkeley.h ha_innodb.h \
|
|
ha_ndbcluster.h opt_range.h protocol.h \
|
|
sql_select.h structs.h table.h sql_udf.h hash_filo.h\
|
|
lex.h lex_symbol.h sql_acl.h sql_crypt.h \
|
|
log_event.h sql_repl.h slave.h \
|
|
stacktrace.h sql_sort.h sql_cache.h set_var.h \
|
|
spatial.h gstream.h client_settings.h tzfile.h \
|
|
tztime.h my_decimal.h\
|
|
sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
|
|
parse_file.h sql_view.h sql_trigger.h \
|
|
sql_array.h sql_cursor.h \
|
|
examples/ha_example.h ha_archive.h \
|
|
examples/ha_tina.h ha_blackhole.h \
|
|
ha_federated.h
|
|
mysqld_SOURCES = sql_lex.cc sql_handler.cc \
|
|
item.cc item_sum.cc item_buff.cc item_func.cc \
|
|
item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
|
|
thr_malloc.cc item_create.cc item_subselect.cc \
|
|
item_row.cc item_geofunc.cc \
|
|
field.cc strfunc.cc key.cc sql_class.cc sql_list.cc \
|
|
net_serv.cc protocol.cc sql_state.c \
|
|
lock.cc my_lock.c \
|
|
sql_string.cc sql_manager.cc sql_map.cc \
|
|
mysqld.cc password.c hash_filo.cc hostname.cc \
|
|
set_var.cc sql_parse.cc sql_yacc.yy \
|
|
sql_base.cc table.cc sql_select.cc sql_insert.cc \
|
|
sql_prepare.cc sql_error.cc sql_locale.cc \
|
|
sql_update.cc sql_delete.cc uniques.cc sql_do.cc \
|
|
procedure.cc item_uniq.cc sql_test.cc \
|
|
log.cc log_event.cc init.cc derror.cc sql_acl.cc \
|
|
unireg.cc des_key_file.cc \
|
|
discover.cc time.cc opt_range.cc opt_sum.cc \
|
|
records.cc filesort.cc handler.cc \
|
|
ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
|
|
ha_berkeley.cc ha_innodb.cc \
|
|
ha_ndbcluster.cc \
|
|
sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
|
|
sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
|
|
sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
|
|
slave.cc sql_repl.cc sql_union.cc sql_derived.cc \
|
|
client.c sql_client.cc mini_client_errors.c pack.c\
|
|
stacktrace.c repl_failsafe.h repl_failsafe.cc \
|
|
sql_olap.cc sql_view.cc \
|
|
gstream.cc spatial.cc sql_help.cc sql_cursor.cc \
|
|
tztime.cc my_time.c my_user.c my_decimal.cc\
|
|
sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \
|
|
sp_cache.cc parse_file.cc sql_trigger.cc \
|
|
examples/ha_example.cc ha_archive.cc \
|
|
examples/ha_tina.cc ha_blackhole.cc \
|
|
ha_federated.cc
|
|
|
|
gen_lex_hash_SOURCES = gen_lex_hash.cc
|
|
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
|
|
mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc
|
|
mysql_tzinfo_to_sql_LDADD = @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
|
|
|
|
DEFS = -DMYSQL_SERVER \
|
|
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
|
@DEFS@
|
|
|
|
BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h
|
|
EXTRA_DIST = $(BUILT_SOURCES) nt_servc.cc nt_servc.h \
|
|
message.mc examples/CMakeLists.txt CMakeLists.txt \
|
|
udf_example.c udf_example.def
|
|
DISTCLEANFILES = lex_hash.h sql_yacc.output
|
|
|
|
AM_YFLAGS = -d --debug --verbose
|
|
|
|
mysql_tzinfo_to_sql.cc:
|
|
rm -f mysql_tzinfo_to_sql.cc
|
|
@LN_CP_F@ $(srcdir)/tztime.cc mysql_tzinfo_to_sql.cc
|
|
|
|
link_sources: mysql_tzinfo_to_sql.cc
|
|
rm -f mini_client_errors.c
|
|
@LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c mini_client_errors.c
|
|
rm -f pack.c
|
|
@LN_CP_F@ $(top_srcdir)/sql-common/pack.c pack.c
|
|
rm -f client.c
|
|
@LN_CP_F@ $(top_srcdir)/sql-common/client.c client.c
|
|
rm -f my_time.c
|
|
@LN_CP_F@ $(top_srcdir)/sql-common/my_time.c my_time.c
|
|
rm -f my_user.c
|
|
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c
|
|
|
|
mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES)
|
|
$(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $<
|
|
|
|
# Try to get better dependencies for the grammar. Othervise really bad
|
|
# things like different grammars for different pars of MySQL can
|
|
# happen if you are unlucky.
|
|
sql_yacc.cc: sql_yacc.yy
|
|
sql_yacc.h: sql_yacc.yy
|
|
|
|
sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEADERS)
|
|
@SED@ -e 's/__attribute__ ((__unused__))//' sql_yacc.cc > sql_yacc.cc-new
|
|
@MV@ sql_yacc.cc-new sql_yacc.cc
|
|
@echo "Note: The following compile may take a long time."
|
|
@echo "If it fails, re-run configure with --with-low-memory"
|
|
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
|
|
|
|
# This generates lex_hash.h
|
|
# NOTE Built sources should depend on their sources not the tool
|
|
# this avoid the rebuild of the built files in a source dist
|
|
lex_hash.h: gen_lex_hash.cc lex.h
|
|
$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
|
|
./gen_lex_hash$(EXEEXT) > $@
|
|
|
|
# For testing of udf_example.so
|
|
noinst_LTLIBRARIES= udf_example.la
|
|
udf_example_la_SOURCES= udf_example.c
|
|
udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
|
|
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|