mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
38005eae6a
Manual merge. Makefile.am: Added new 'plugin' subdir. configure.in: Added plugin related makefiles. include/my_base.h: Added HA_OPEN_FROM_SQL_LAYER flag - indicates that a table was openned from the sql layer. Added HA_OPTION_RELIES_ON_SQL_LAYER flag - indicates that a table relies on the sql layer. Added HA_CREATE_RELIES_ON_SQL_LAYER flag - indicates that a table must be created with HA_OPTION_RELIES_ON_SQL_LAYER flag. include/myisam.h: Distinct fulltext parser number added. include/plugin.h: Revise comment. sql/ha_myisam.cc: Pass HA_OPEN_FROM_SQL_LAYER flag to mi_open(). Pass HA_CREATE_RELIES_ON_SQL_LAYER flag to mi_create(). sql/sql_plugin.cc: Reuse "unused" dynamic array elements. A check for plugin info interface version. sql/sql_plugin.h: Added plugin_type_names[] - string plugin type names. sql/sql_show.cc: Use plugin_type_names array instead of switch to find literal parser name representation. sql/sql_table.cc: Fixed that ALTER TABLE ... ADD INDEX loses WITH PARSER info. storage/myisam/ft_boolean_search.c: Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by ftparser_call_initializer(), to parser->parse(). storage/myisam/ft_nlq_search.c: Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by ftparser_call_initializer(), to parser->parse(). storage/myisam/ft_parser.c: Added two functions: ftparser_call_initializer() - calls parser->init() function if specified and parser is not yet initialized. Returns MYSQL_FTPARSER_PARAM *. ftparser_call_deinitializer() - calls parser->deinit() function if specified and parser was initialized. Deinitializes all parsers. ft_parse() accepts additional param now - MYSQL_FTPARSER_PARM and passes it to parser->parse(). storage/myisam/ft_update.c: Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by ftparser_call_initializer(), to _mi_ft_parse(). _mi_ft_parse() accepts additional param now - MYSQL_FTPARSER_PARAM and passes it to parser->parse(). storage/myisam/ftdefs.h: Prototypes for new functions were added. MYSQL_FTPARSER_PARAM was added to ft_parse and _mi_ft_parse(). storage/myisam/mi_close.c: Free ftparser_param allocated by ftparser_call_initializer(). storage/myisam/mi_create.c: If a table relies on the sql layer, set HA_OPTION_RELIES_ON_SQL_LAYER. storage/myisam/mi_locking.c: Call deinitializer for each initialized parser. storage/myisam/mi_open.c: Set default values for share->ftparser and keydef->ftparser_nr. If a table is openned from the non-sql layer and HA_OPTION_RELIES_ON_SQL_LAYER is set, raise HA_ERR_UNSUPPORTED error. storage/myisam/myisamdef.h: Added number of distinct parsers to MYISAM_SHARE. Added ftparser_param to MI_INFO. plugin/Makefile.am: New BitKeeper file ``plugin/Makefile.am'' plugin/fulltext/Makefile.am: New BitKeeper file ``plugin/fulltext/Makefile.am'' plugin/fulltext/plugin_example.c: New BitKeeper file ``plugin/fulltext/plugin_example.c''
164 lines
5.7 KiB
Makefile
164 lines
5.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
|
|
|
|
# Process this file with automake to create Makefile.in
|
|
|
|
AUTOMAKE_OPTIONS = foreign
|
|
|
|
# These are built from source in the Docs directory
|
|
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
|
|
README COPYING EXCEPTIONS-CLIENT
|
|
SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
|
|
@readline_topdir@ sql-common \
|
|
@thread_dirs@ pstack \
|
|
@sql_union_dirs@ @mysql_se_dirs@ \
|
|
@sql_server@ scripts @man_dirs@ tests \
|
|
@mysql_se_plugins@ \
|
|
netware @libmysqld_dirs@ \
|
|
@bench_dirs@ support-files @tools_dirs@ \
|
|
plugin
|
|
|
|
DIST_SUBDIRS = . include @docs_dirs@ zlib \
|
|
@readline_topdir@ sql-common \
|
|
@thread_dirs@ pstack \
|
|
strings mysys dbug extra regex storage \
|
|
vio sql libmysql_r libmysql client scripts \
|
|
@man_dirs@ tests SSL\
|
|
BUILD netware os2 @libmysqld_dirs@\
|
|
@bench_dirs@ support-files server-tools tools \
|
|
plugin
|
|
|
|
# Run these targets before any others, also make part of clean target,
|
|
# to make sure we create new links after a clean.
|
|
BUILT_SOURCES = linked_client_sources linked_server_sources \
|
|
@linked_client_targets@ \
|
|
@linked_libmysqld_targets@ \
|
|
linked_include_sources @linked_netware_sources@
|
|
|
|
# The db.h file is a bit special, see note in "configure.in".
|
|
# In the case we didn't compile with bdb, a dummy file is put
|
|
# there, but will not be removed by the bdb make file becuase
|
|
# it will never be called.
|
|
CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
|
|
DISTCLEANFILES = ac_available_languages_fragment
|
|
|
|
linked_include_sources:
|
|
cd include; $(MAKE) link_sources
|
|
echo timestamp > linked_include_sources
|
|
|
|
linked_client_sources: @linked_client_targets@
|
|
cd client; $(MAKE) link_sources
|
|
echo timestamp > linked_client_sources
|
|
|
|
linked_libmysql_sources:
|
|
cd libmysql; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysql_sources
|
|
|
|
linked_libmysql_r_sources: linked_libmysql_sources
|
|
cd libmysql_r; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysql_r_sources
|
|
|
|
linked_libmysqld_sources:
|
|
cd libmysqld; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysqld_sources
|
|
|
|
linked_libmysqldex_sources:
|
|
cd libmysqld/examples; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysqldex_sources
|
|
|
|
linked_netware_sources:
|
|
cd @netware_dir@; $(MAKE) link_sources
|
|
echo timestamp > linked_netware_sources
|
|
|
|
linked_server_sources:
|
|
cd sql; $(MAKE) link_sources
|
|
echo timestamp > linked_server_sources
|
|
|
|
# Create permission databases
|
|
init-db: all
|
|
$(top_builddir)/scripts/mysql_install_db
|
|
|
|
bin-dist: all
|
|
$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
|
|
|
|
# Remove BK's "SCCS" subdirectories from source distribution
|
|
dist-hook:
|
|
rm -rf `find $(distdir) -type d -name SCCS -print`
|
|
|
|
tags:
|
|
support-files/build-tags
|
|
.PHONY: init-db bin-dist
|
|
|
|
# Target 'test' will run the regression test suite using the built server.
|
|
#
|
|
# If you are running in a shared environment, users can avoid clashing
|
|
# port numbers by setting individual small numbers 1-100 to the
|
|
# environment variable MTR_BUILD_THREAD. The script "mysql-test-run"
|
|
# will then calculate the various port numbers it needs from this,
|
|
# making sure each user use different ports.
|
|
|
|
test:
|
|
cd mysql-test ; \
|
|
./mysql-test-run --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run --ps-protocol --mysqld=--binlog-format=row
|
|
|
|
test-full:
|
|
cd mysql-test ; \
|
|
./mysql-test-run --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run --ps-protocol --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run --mysqld=--binlog-format=row && \
|
|
./mysql-test-run --ps-protocol --mysqld=--binlog-format=row
|
|
|
|
test-force:
|
|
cd mysql-test ; \
|
|
./mysql-test-run --force --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run --ps-protocol --force --mysqld=--binlog-format=row
|
|
|
|
test-force-full:
|
|
cd mysql-test ; \
|
|
./mysql-test-run --force --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run --force --mysqld=--binlog-format=row && \
|
|
./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=row
|
|
|
|
# We are testing a new Perl version of the test script
|
|
test-pl:
|
|
cd mysql-test ; \
|
|
./mysql-test-run.pl --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row
|
|
|
|
test-full-pl:
|
|
cd mysql-test ; \
|
|
./mysql-test-run.pl --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run.pl --mysqld=--binlog-format=row && \
|
|
./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row
|
|
|
|
test-force-pl:
|
|
cd mysql-test ; \
|
|
./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row
|
|
|
|
test-force-full-pl:
|
|
cd mysql-test ; \
|
|
./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \
|
|
./mysql-test-run.pl --force --mysqld=--binlog-format=row && \
|
|
./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|
|
|