mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
034b44cb9f
BitKeeper/etc/logging_ok: auto-union scripts/make_win_src_distribution.old: Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old BUILD/compile-pentium-debug-max: Auto merged BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86: Auto merged BitKeeper/deleted/.del-sel000001.test~9567c1646058cc: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged Docs/Makefile.am: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged extra/perror.c: Auto merged include/config-win.h: Auto merged include/my_sys.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0pcur.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/include/buf0buf.h: Auto merged innobase/include/log0recv.h: Auto merged innobase/include/row0sel.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0mem.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_extra.c: Auto merged myisam/mi_key.c: Auto merged myisam/myisamdef.h: Auto merged myisammrg/myrg_queue.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/flush.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/grant_cache.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/rpl000018.result: Auto merged mysql-test/r/rpl_insert_id.result: Auto merged mysql-test/r/rpl_master_pos_wait.result: Auto merged mysql-test/r/rpl_relayspace.result: Auto merged mysql-test/r/select_safe.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/alias.test: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/fulltext_left_join.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/join_outer.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl000018.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/sel000100.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/default.c: Auto merged mysys/mf_format.c: Auto merged mysys/my_getopt.c: Auto merged mysys/thr_lock.c: Auto merged mysys/tree.c: Auto merged scripts/Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/Makefile.am: Auto merged sql/field_conv.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/net_serv.cc: Auto merged sql/nt_servc.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/uniques.cc: Auto merged support-files/mysql.spec.sh: Auto merged vio/viosocket.c: Auto merged BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: merge BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: merge acinclude.m4: Merge with 4.0 (openssl patch) client/mysqlbinlog.cc: Merge with 4.0 in which we had added code from 4.1 (We are basicly only using the 4.1 code here) configure.in: Keep 4.1 file heap/hp_open.c: merge with 4.0 include/my_base.h: merge with 4.0 include/my_global.h: merge with 4.0 include/mysqld_error.h: merge with 4.0 innobase/ha/ha0ha.c: merge with 4.0 (Code should be same but we use indentaion from 4.0) innobase/log/log0recv.c: merge with 4.0 libmysql/libmysql.c: Remove with 4.0 code that was ported from 4.1 libmysqld/lib_sql.cc: merge with 4.0 myisam/mi_open.c: Remove 4.0 specific code myisam/myisamchk.c: merge with 4.0 myisammrg/myrg_rkey.c: merge with 4.0 mysql-test/r/alter_table.result: May need to be fixed after merge mysql-test/r/create.result: May need to be fixed after merge mysql-test/r/distinct.result: May need to be fixed after merge mysql-test/r/drop.result: May need to be fixed after merge mysql-test/r/fulltext.result: May need to be fixed after merge mysql-test/r/func_set.result: May need to be fixed after merge mysql-test/r/func_str.result: May need to be fixed after merge mysql-test/r/func_test.result: May need to be fixed after merge mysql-test/r/grant.result: May need to be fixed after merge mysql-test/r/group_by.result: May need to be fixed after merge mysql-test/r/handler.result: May need to be fixed after merge mysql-test/r/heap.result: May need to be fixed after merge mysql-test/r/innodb.result: May need to be fixed after merge mysql-test/r/insert.result: May need to be fixed after merge mysql-test/r/insert_select.result: May need to be fixed after merge mysql-test/r/key_diff.result: May need to be fixed after merge mysql-test/r/merge.result: May need to be fixed after merge mysql-test/r/myisam.result: May need to be fixed after merge mysql-test/r/order_by.result: May need to be fixed after merge mysql-test/r/query_cache.result: May need to be fixed after merge mysql-test/r/rpl_flush_log_loop.result: May need to be fixed after merge mysql-test/r/rpl_loaddata.result: May need to be fixed after merge mysql-test/r/rpl_log.result: May need to be fixed after merge mysql-test/r/rpl_log_pos.result: May need to be fixed after merge mysql-test/r/rpl_rotate_logs.result: May need to be fixed after merge mysql-test/r/select.result: May need to be fixed after merge mysql-test/r/union.result: May need to be fixed after merge mysql-test/r/user_var.result: May need to be fixed after merge mysql-test/t/alter_table.test: merge with 4.0 mysql-test/t/create.test: merge with 4.0 mysql-test/t/distinct.test: merge with 4.0 mysql-test/t/drop.test: merge with 4.0 mysql-test/t/flush.test: merge with 4.0 mysql-test/t/fulltext.test: merge with 4.0 mysql-test/t/func_set.test: merge with 4.0 mysql-test/t/func_str.test: merge with 4.0 mysql-test/t/func_test.test: merge with 4.0 mysql-test/t/grant.test: merge with 4.0 mysql-test/t/grant_cache.test: merge with 4.0 mysql-test/t/innodb.test: Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB mysql-test/t/insert.test: merge with 4.0 mysql-test/t/insert_select.test: merge with 4.0 mysql-test/t/merge.test: merge with 4.0 mysql-test/t/query_cache.test: merge with 4.0 mysql-test/t/rpl_flush_log_loop.test: merge with 4.0 mysql-test/t/rpl_loaddata.test: merge with 4.0 mysql-test/t/rpl_rotate_logs.test: merge with 4.0 mysql-test/t/select.test: merge with 4.0 mysql-test/t/symlink.test: merge with 4.0 mysql-test/t/union.test: merge with 4.0 mysys/charset.c: merge with 4.0 scripts/mysql_fix_privilege_tables.sh: merge with 4.0 (Add quoting for some variables) sql/field.h: merge with 4.0 sql/ha_innodb.cc: merge with 4.0 sql/item_cmpfunc.cc: merge with 4.0 sql/item_cmpfunc.h: merge with 4.0 sql/item_func.h: merge with 4.0 sql/item_strfunc.cc: merge with 4.0 Fixed null handling with ELT() sql/item_timefunc.h: merge with 4.0 sql/lex.h: merge with 4.0 sql/log.cc: merge with 4.0 sql/log_event.cc: Merge with 4.0 Cleanups: - Indentation - #endif comments - Replace strmov() with *pos++= for two byte strings - Moved variable declarations to start of functions - Merged identical code (LOAD_EVENT) - Added casts when subtracting pointers Did a full diff between this and 4.0 to ensure that the file is correct after merge. sql/log_event.h: merge with 4.0 sql/mysql_priv.h: merge with 4.0 sql/mysqld.cc: merge with 4.0 sql/repl_failsafe.cc: merge with 4.0 sql/set_var.cc: merge with 4.0 sql/set_var.h: merge with 4.0 sql/share/czech/errmsg.txt: merge with 4.0 sql/share/danish/errmsg.txt: merge with 4.0 sql/share/dutch/errmsg.txt: merge with 4.0 sql/share/english/errmsg.txt: merge with 4.0 sql/share/estonian/errmsg.txt: merge with 4.0 sql/share/french/errmsg.txt: merge with 4.0 sql/share/german/errmsg.txt: merge with 4.0 sql/share/greek/errmsg.txt: merge with 4.0 sql/share/hungarian/errmsg.txt: merge with 4.0 sql/share/italian/errmsg.txt: merge with 4.0 sql/share/japanese/errmsg.txt: merge with 4.0 sql/share/korean/errmsg.txt: merge with 4.0 sql/share/norwegian-ny/errmsg.txt: merge with 4.0 sql/share/norwegian/errmsg.txt: merge with 4.0 sql/share/polish/errmsg.txt: merge with 4.0 sql/share/portuguese/errmsg.txt: merge with 4.0 sql/share/romanian/errmsg.txt: merge with 4.0 sql/share/russian/errmsg.txt: merge with 4.0 sql/share/slovak/errmsg.txt: merge with 4.0 sql/share/spanish/errmsg.txt: merge with 4.0 sql/share/swedish/errmsg.txt: merge with 4.0 sql/share/ukrainian/errmsg.txt: merge with 4.0 sql/slave.cc: Merge + some indentation fixes sql/slave.h: merge with 4.0 sql/sql_acl.cc: merge with 4.0 Some end space removal to make it easier to do future merges sql/sql_acl.h: merge with 4.0 sql/sql_cache.cc: merge with 4.0 sql/sql_class.h: merge with 4.0 sql/sql_handler.cc: merge with 4.0 sql/sql_lex.cc: merge with 4.0 sql/sql_lex.h: merge with 4.0 sql/sql_parse.cc: merge with 4.0 sql/sql_repl.cc: merge with 4.0 sql/sql_select.cc: merge with 4.0 sql/sql_table.cc: merge with 4.0 sql/sql_union.cc: Merge with 4.0 Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later sql/sql_yacc.yy: merge with 4.0 Removed end space to make merge easier vio/Makefile.am: merge with 4.0
141 lines
5.2 KiB
Makefile
141 lines
5.2 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 = @MT_INCLUDES@ \
|
|
@bdb_includes@ @innodb_includes@ \
|
|
-I$(top_srcdir)/include -I$(top_srcdir)/regex \
|
|
-I$(srcdir) $(openssl_includes)
|
|
WRAPLIBS= @WRAPLIBS@
|
|
SUBDIRS = share
|
|
libexec_PROGRAMS = mysqld
|
|
noinst_PROGRAMS = gen_lex_hash
|
|
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
|
|
LDADD = @isam_libs@ \
|
|
../myisam/libmyisam.a \
|
|
../myisammrg/libmyisammrg.a \
|
|
../heap/libheap.a \
|
|
../vio/libvio.a \
|
|
../mysys/libmysys.a \
|
|
../dbug/libdbug.a \
|
|
../regex/libregex.a \
|
|
../strings/libmystrings.a
|
|
|
|
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
|
|
@bdb_libs@ @innodb_libs@ @pstack_libs@ \
|
|
@innodb_system_libs@ \
|
|
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @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 \
|
|
procedure.h sql_class.h sql_lex.h sql_list.h \
|
|
sql_manager.h sql_map.h sql_string.h unireg.h \
|
|
field.h handler.h \
|
|
ha_isammrg.h ha_isam.h ha_myisammrg.h\
|
|
ha_heap.h ha_myisam.h ha_berkeley.h ha_innodb.h \
|
|
opt_range.h opt_ft.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
|
|
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 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_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 \
|
|
time.cc opt_range.cc opt_sum.cc opt_ft.cc \
|
|
records.cc filesort.cc handler.cc \
|
|
ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
|
|
ha_berkeley.cc ha_innodb.cc \
|
|
ha_isam.cc ha_isammrg.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\
|
|
gstream.cc spatial.cc sql_help.cc protocol_cursor.cc
|
|
gen_lex_hash_SOURCES = gen_lex_hash.cc
|
|
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
|
|
|
|
DEFS = -DMYSQL_SERVER \
|
|
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
|
@DEFS@
|
|
# Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion
|
|
BUILT_SOURCES = sql_yacc.cc sql_yacc.h
|
|
EXTRA_DIST = udf_example.cc $(BUILT_SOURCES)
|
|
AM_YFLAGS = -d
|
|
|
|
link_sources:
|
|
rm -f mini_client_errors.c
|
|
@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
|
|
rm -f pack.c
|
|
@LN_CP_F@ ../sql-common/pack.c pack.c
|
|
rm -f client.c
|
|
@LN_CP_F@ ../sql-common/client.c client.c
|
|
|
|
gen_lex_hash.o: gen_lex_hash.cc lex.h
|
|
$(CXXCOMPILE) -c $(INCLUDES) $<
|
|
|
|
# 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)
|
|
@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 $<
|
|
|
|
lex_hash.h: lex.h gen_lex_hash.cc sql_yacc.h
|
|
$(MAKE) gen_lex_hash$(EXEEXT)
|
|
./gen_lex_hash$(EXEEXT) > $@
|
|
|
|
# Hack to ensure that lex_hash.h is built early
|
|
sql_lex.o: lex_hash.h
|
|
|
|
# For testing of udf_example.so; Works on platforms with gcc
|
|
# (This is not part of our build process but only provided as an example)
|
|
udf_example.so: udf_example.cc
|
|
$(CXXCOMPILE) -shared -o $@ $<
|
|
|
|
#distclean:
|
|
# rm -f lex_hash.h
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|