mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
2c86b5ad16
into romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl client/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/rpl_injector.h: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/ctype_cp932_binlog_stm.result: Manual merge , mysql-test/r/flush_block_commit_notembedded.result: Manual merge mysql-test/r/rpl_000015.result: Manual merge mysql-test/r/rpl_change_master.result: Manual merge mysql-test/r/rpl_deadlock_innodb.result: Manual merge mysql-test/r/rpl_flushlog_loop.result: Manual merge , mysql-test/r/rpl_loaddata.result: manual merge mysql-test/r/rpl_loaddata_s.result: manual merge , mysql-test/r/rpl_log_pos.result: manual merge mysql-test/r/rpl_ndb_charset.result: manual merge mysql-test/r/rpl_ndb_log.result: manual merge , mysql-test/r/rpl_ndb_multi.result: manual merge mysql-test/r/rpl_rbr_to_sbr.result: manual merge mysql-test/r/rpl_rotate_logs.result: Manual merge mysql-test/r/rpl_row_basic_11bugs.result: Manual merge mysql-test/r/rpl_row_charset.result: Manual merge mysql-test/r/rpl_row_create_table.result: Manual merge mysql-test/r/rpl_row_delayed_ins.result: Manual merge mysql-test/r/rpl_row_drop.result: Manual merge mysql-test/r/rpl_row_flsh_tbls.result: Manual merge mysql-test/r/rpl_row_inexist_tbl.result: Manual merge mysql-test/r/rpl_row_log.result: Manual merge mysql-test/r/rpl_row_log_innodb.result: Manual merge mysql-test/r/rpl_row_max_relay_size.result: Manual merge mysql-test/r/rpl_row_reset_slave.result: Manual merge mysql-test/r/rpl_row_until.result: Manual merge mysql-test/r/rpl_server_id1.result: Manual merge mysql-test/r/rpl_server_id2.result: Manual merge mysql-test/r/rpl_sp.result: Manual merge mysql-test/r/rpl_stm_charset.result: Manual merge mysql-test/r/rpl_stm_flsh_tbls.result: Manual merge mysql-test/r/rpl_stm_log.result: Manual merge mysql-test/r/rpl_stm_max_relay_size.result: Manual merge mysql-test/r/rpl_stm_multi_query.result: Manual merge mysql-test/r/rpl_stm_reset_slave.result: Manual merge mysql-test/r/rpl_stm_until.result: Manual merge mysql-test/r/rpl_switch_stm_row_mixed.result: Manual merge mysql-test/r/rpl_truncate_2myisam.result: Manual merge mysql-test/r/rpl_truncate_3innodb.result: Manual merge mysql-test/r/rpl_truncate_7ndb.result: Manual merge mysql-test/r/user_var-binlog.result: Manual merge mysql-test/t/binlog_row_mix_innodb_myisam.test: Manual merge mysql-test/extra/binlog_tests/binlog.test: Binlog position change. mysql-test/extra/binlog_tests/binlog_insert_delayed.test: Binlog position change. mysql-test/extra/binlog_tests/ctype_cp932_binlog.test: Binlog position change. mysql-test/extra/binlog_tests/ctype_ucs_binlog.test: Binlog position change. mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_deadlock.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_log.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_multi_query.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_row_charset.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_stm_charset.test: Binlog position change. mysql-test/include/show_binlog_events.inc: Binlog position change. mysql-test/r/binlog_row_binlog.result: Result change mysql-test/r/binlog_row_ctype_ucs.result: Result change mysql-test/r/binlog_row_insert_select.result: Result change mysql-test/r/binlog_row_mix_innodb_myisam.result: Result change mysql-test/r/binlog_stm_binlog.result: Result change mysql-test/r/binlog_stm_ctype_ucs.result: Result change mysql-test/r/binlog_stm_insert_select.result: Result change mysql-test/r/binlog_stm_mix_innodb_myisam.result: Result change mysql-test/r/ctype_cp932_binlog_row.result: Result change mysql-test/t/binlog_stm_mix_innodb_myisam.test: Binlog position change. mysql-test/t/ctype_cp932_binlog_stm.test: Binlog position change. mysql-test/t/mysqlbinlog.test: Binlog position change. mysql-test/t/mysqlbinlog2.test: Binlog position change. mysql-test/t/rpl_loaddata_s.test: Binlog position change. mysql-test/t/rpl_log_pos.test: Binlog position change. mysql-test/t/rpl_row_basic_11bugs.test: Binlog position change. mysql-test/t/rpl_row_create_table.test: Binlog position change. mysql-test/t/rpl_row_flsh_tbls.test: Binlog position change. mysql-test/t/rpl_row_mysqlbinlog.test: Binlog position change. mysql-test/t/rpl_sp.test: Binlog position change. mysql-test/t/rpl_stm_flsh_tbls.test: Binlog position change. mysql-test/t/rpl_switch_stm_row_mixed.test: Binlog position change. mysql-test/t/user_var-binlog.test: Binlog position change. sql/share/errmsg.txt: Merging error messages
182 lines
7.1 KiB
Makefile
182 lines
7.1 KiB
Makefile
# Copyright (C) 2000-2006 MySQL 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; 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
|
|
|
|
#called from the top level Makefile
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
MYSQLLIBdir= $(pkglibdir)
|
|
INCLUDES = @ZLIB_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@
|
|
SUPPORTING_LIBS = $(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
|
|
mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS)
|
|
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
|
|
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
|
|
@pstack_libs@ \
|
|
@mysql_plugin_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_xmlfunc.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_map.h sql_string.h unireg.h \
|
|
sql_error.h field.h handler.h mysqld_suffix.h \
|
|
ha_partition.h \
|
|
ha_ndbcluster.h ha_ndbcluster_binlog.h \
|
|
ha_ndbcluster_tables.h rpl_constants.h \
|
|
opt_range.h protocol.h rpl_tblmap.h rpl_utility.h \
|
|
log.h sql_show.h rpl_rli.h rpl_mi.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 rpl_filter.h \
|
|
rpl_injector.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 events.h scheduler.h \
|
|
event_db_repository.h event_queue.h \
|
|
sql_plugin.h authors.h \
|
|
event_data_objects.h event_scheduler.h \
|
|
sql_partition.h partition_info.h partition_element.h \
|
|
contributors.h sql_servers.h
|
|
mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.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 item_xmlfunc.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 \
|
|
sql_connect.cc scheduler.cc sql_parse.cc \
|
|
set_var.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 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_partition.cc \
|
|
ha_ndbcluster.cc ha_ndbcluster_binlog.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 rpl_filter.cc rpl_tblmap.cc \
|
|
rpl_utility.cc rpl_injector.cc rpl_rli.cc rpl_mi.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 \
|
|
event_scheduler.cc event_data_objects.cc \
|
|
event_queue.cc event_db_repository.cc events.cc \
|
|
sql_plugin.cc sql_binlog.cc \
|
|
sql_builtin.cc sql_tablespace.cc partition_info.cc \
|
|
sql_servers.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)\"" \
|
|
-DLIBDIR="\"$(MYSQLLIBdir)\"" \
|
|
@DEFS@
|
|
|
|
BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h
|
|
BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h
|
|
EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
|
|
nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
|
|
udf_example.c udf_example.def
|
|
CLEANFILES = lex_hash.h sql_yacc.output
|
|
DISTCLEANFILES = $(EXTRA_PROGRAMS)
|
|
MAINTAINERCLEANFILES = $(BUILT_MAINT_SRC)
|
|
AM_YFLAGS = -d --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 $<
|
|
|
|
# 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) > $@-t
|
|
$(MV) $@-t $@
|
|
|
|
# the following three should eventually be moved out of this directory
|
|
ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
ha_ndbcluster_binlog.o:ha_ndbcluster_binlog.cc ha_ndbcluster_binlog.h
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
#Until we can get rid of dependencies on ha_ndbcluster.h
|
|
handler.o: handler.cc ha_ndbcluster.h
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(CXXFLAGS) -c $<
|
|
|
|
# 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.%
|