mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
4e72191ce9
Backport of functionality in private 5.2 tree. Added new language to parser, new mysql.servers table and associated code to be used by the federated storage engine to allow central connection information per WL entry. libmysqld/Makefile.am: WL# 3031 Added sql_servers.cc to libmysqld Makefile.am mysql-test/lib/init_db.sql: WL# 3031 Added mysql.servers creation to init_db.sql, which is in turn called by mysql-test-run.pl scripts/mysql_create_system_tables.sh: WL# 3031 Added mysql.servers table creation to script called by non-perl mysql-test-run sql/Makefile.am: WL# 3031 Added sql_servers source and headers to Makefile.am to be built sql/lex.h: WL# 3031 Added tokens needed for SERVERS scheme sql/mysql_priv.h: WL #3031 Added sql_servers.h to mysql_priv.h so mysqld.cc and other code can link with sql_servers code sql/mysqld.cc: WL# 3031 Added servers_free and servers_init to mysqld sql/sql_lex.cc: WL# 3031 Added lex->server_options parameter initialisation sql/sql_lex.h: WL #3031 Added SQLCOM commands needed for sql_server actions sql/sql_parse.cc: WL# 3031 Added switch actions for new SQLCOM sql_server actions sql/sql_yacc.yy: WL #3031 Added tokens needed for sql_servers, CREATE/DROP/ALTER server functionality sql/share/errmsg.txt: WL# 3031 Added two new errors to errormsg.sys storage/federated/ha_federated.cc: WL #3031 Modified federated storage engine to use new connection scheme (servers table) if connection string only specifies connection name vs. complete URL storage/federated/ha_federated.h: WL# 3031 Added new share members needed for connection scheme sql/sql_servers.cc: WL #3031 sql_servers.cc - all methods required for manipulating mysql.servers table to work with federated new connection scheme (CREATE/ALTER/DROP SERVER ...) sql/sql_servers.h: WL #3031 New header file for sql_servers functionality mysql-test/r/federated_server.result: WL #3031 New test results for testing new connection scheme sql/sql_yacc.yy.bak: WL #3031 Added tokens and definitions required for new CREATE/ALTER/DROP SERVER for sql_servers functionality. See WL for details. mysql-test/t/federated_server.test: WL #3031 New test for testing CREATE/ALTER/DROP SERVER, as well as testing that federated works with both tradition connection scheme as well as new connection scheme.
206 lines
7.5 KiB
Makefile
206 lines
7.5 KiB
Makefile
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Library General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library 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
|
|
# Library General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Library General Public
|
|
# License along with this library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
# MA 02111-1307, USA
|
|
#
|
|
# This file is public domain and comes with NO WARRANTY of any kind
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
MYSQLLIBdir= $(libdir)
|
|
|
|
EXTRA_DIST = libmysqld.def
|
|
DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
|
|
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
|
-DLIBDIR="\"$(MYSQLLIBdir)\""
|
|
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
|
|
-I$(top_srcdir)/sql/examples \
|
|
-I$(top_srcdir)/regex \
|
|
$(openssl_includes) @ZLIB_INCLUDES@ \
|
|
@condition_dependent_plugin_includes@
|
|
|
|
noinst_LIBRARIES = libmysqld_int.a
|
|
pkglib_LIBRARIES = libmysqld.a
|
|
SUBDIRS = . examples
|
|
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
|
|
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
|
|
my_time.c
|
|
|
|
noinst_HEADERS = embedded_priv.h emb_qcache.h
|
|
|
|
sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
|
|
ha_ndbcluster.cc \
|
|
ha_ndbcluster_binlog.cc ha_partition.cc \
|
|
handler.cc sql_handler.cc \
|
|
hostname.cc init.cc password.c \
|
|
item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
|
|
item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
|
|
item_geofunc.cc item_uniq.cc item_subselect.cc item_row.cc\
|
|
item_xmlfunc.cc \
|
|
key.cc lock.cc log.cc log_event.cc sql_state.c \
|
|
protocol.cc net_serv.cc opt_range.cc \
|
|
opt_sum.cc procedure.cc records.cc sql_acl.cc \
|
|
sql_load.cc discover.cc sql_locale.cc \
|
|
sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
|
|
sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \
|
|
sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \
|
|
sql_prepare.cc sql_derived.cc sql_rename.cc \
|
|
sql_select.cc sql_do.cc sql_show.cc set_var.cc \
|
|
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
|
|
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
|
|
unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
|
|
spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
|
|
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
|
|
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
|
|
event_scheduler.cc events.cc event_data_objects.cc \
|
|
event_queue.cc event_db_repository.cc \
|
|
rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
|
|
sql_tablespace.cc \
|
|
rpl_injector.cc my_user.c partition_info.cc \
|
|
sql_servers.cc
|
|
|
|
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
|
|
libmysqld_a_SOURCES=
|
|
|
|
sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES)
|
|
storagesources = @condition_dependent_plugin_modules@
|
|
storagesourceslinks = @condition_dependent_plugin_links@
|
|
|
|
# automake misses these
|
|
sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
|
|
|
|
# The following libraries should be included in libmysqld.a
|
|
INC_LIB= $(top_builddir)/regex/libregex.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/strings/libmystrings.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/vio/libvio.a \
|
|
@mysql_plugin_libs@ \
|
|
$(yassl_inc_libs)
|
|
|
|
if HAVE_YASSL
|
|
yassl_inc_libs= $(top_builddir)/extra/yassl/src/.libs/libyassl.a \
|
|
$(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
|
|
endif
|
|
|
|
# Storage engine specific compilation options
|
|
ha_ndbcluster.o:ha_ndbcluster.cc
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
# Until we can remove dependency on ha_ndbcluster.h
|
|
handler.o: handler.cc
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
|
|
#
|
|
# To make it easy for the end user to use the embedded library we
|
|
# generate a total libmysqld.a from all library files,
|
|
|
|
# note - InnoDB libraries have circular dependencies, so in INC_LIB
|
|
# few libraries are present two times. Metrowerks linker doesn't like
|
|
# it at all. Traditional ar has no problems with it, but still there's no
|
|
# need to add the same file twice to the library, so 'sort -u' save us
|
|
# some time and spares unnecessary work.
|
|
|
|
libmysqld.a: libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES)
|
|
if DARWIN_MWCC
|
|
mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`
|
|
else
|
|
-rm -f libmysqld.a
|
|
if test "$(host_os)" = "netware" ; \
|
|
then \
|
|
$(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
|
|
else \
|
|
current_dir=`pwd`; \
|
|
rm -rf tmp; mkdir tmp; \
|
|
(for arc in ./libmysqld_int.a $(INC_LIB); do \
|
|
arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
|
|
artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
|
|
for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
|
|
if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
|
|
mkdir $$artmp; cd $$artmp > /dev/null; \
|
|
$(AR) x ../../$$arc; \
|
|
cd $$current_dir > /dev/null; \
|
|
ls $$artmp/* | grep -v SYMDEF; \
|
|
continue 2; fi; done; \
|
|
done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
|
|
$(RANLIB) libmysqld.a ; \
|
|
rm -rf tmp; \
|
|
fi
|
|
endif
|
|
|
|
## XXX: any time the client interface changes, we'll need to bump
|
|
## the version info for libmysqld; however, it's possible for the
|
|
## libmysqld interface to change without affecting the standard
|
|
## libmysqlclient interface. Should we make a separate version
|
|
## string for the two?
|
|
#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
|
|
#CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la
|
|
|
|
# This is called from the toplevel makefile. If we can link now
|
|
# to an existing file in source, we do that, else we assume it
|
|
# will show up in the build tree eventually (generated file).
|
|
link_sources:
|
|
set -x; \
|
|
for f in $(sqlsources); do \
|
|
rm -f $$f; \
|
|
if test -e $(top_srcdir)/sql/$$f ; \
|
|
then \
|
|
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
|
|
else \
|
|
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
|
|
fi ; \
|
|
done; \
|
|
for f in $(libmysqlsources); do \
|
|
rm -f $$f; \
|
|
if test -e $(top_srcdir)/libmysql/$$f ; \
|
|
then \
|
|
@LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
|
|
else \
|
|
@LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \
|
|
fi ; \
|
|
done; \
|
|
if test -n "$(sqlstoragesources)" ; \
|
|
then \
|
|
for f in "$(sqlstoragesources)"; do \
|
|
rm -f "$$f"; \
|
|
@LN_CP_F@ `find $(srcdir)/../sql -name "$$f"` "$$f"; \
|
|
done; \
|
|
fi; \
|
|
if test -n "$(storagesources)" ; \
|
|
then \
|
|
rm -f $(storagesources); \
|
|
for f in $(storagesourceslinks); do \
|
|
@LN_CP_F@ $(top_srcdir)/$$f . ; \
|
|
done; \
|
|
fi; \
|
|
rm -f client_settings.h; \
|
|
@LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h
|
|
|
|
|
|
clean-local:
|
|
rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"` \
|
|
$(top_srcdir)/linked_libmysqld_sources; \
|
|
rm -f client_settings.h
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|