2006-04-11 15:45:10 +02:00
|
|
|
# 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
|
|
|
|
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
EXTRA_DIST = ma_test_all.sh ma_test_all.res ma_ft_stem.c CMakeLists.txt
|
2006-04-11 15:45:10 +02:00
|
|
|
pkgdata_DATA = ma_test_all ma_test_all.res
|
|
|
|
|
|
|
|
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
|
|
|
|
LDADD = @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
|
|
pkglib_LIBRARIES = libmaria.a
|
2006-05-05 20:32:02 +02:00
|
|
|
bin_PROGRAMS = maria_chk maria_pack maria_ftdump
|
2006-04-11 15:45:10 +02:00
|
|
|
maria_chk_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
maria_pack_DEPENDENCIES=$(LIBRARIES)
|
2006-09-01 17:53:10 +02:00
|
|
|
noinst_PROGRAMS = ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test ma_control_file_test
|
2006-09-04 16:53:09 +02:00
|
|
|
noinst_HEADERS = maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
|
|
|
|
ma_sp_defs.h ma_fulltext.h ma_ftdefs.h ma_ft_test1.h ma_ft_eval.h \
|
|
|
|
ma_control_file.h
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_test1_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
ma_test2_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
ma_test3_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
#ma_ft_test1_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
#ma_ft_eval_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
maria_ftdump_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
ma_rt_test_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
ma_sp_test_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
libmaria_a_SOURCES = ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
|
|
|
|
ma_rnext.c ma_rnext_same.c \
|
|
|
|
ma_search.c ma_page.c ma_key.c ma_locking.c \
|
|
|
|
ma_rrnd.c ma_scan.c ma_cache.c \
|
|
|
|
ma_statrec.c ma_packrec.c ma_dynrec.c \
|
|
|
|
ma_update.c ma_write.c ma_unique.c \
|
|
|
|
ma_delete.c \
|
|
|
|
ma_rprev.c ma_rfirst.c ma_rlast.c ma_rsame.c \
|
|
|
|
ma_rsamepos.c ma_panic.c ma_close.c ma_create.c\
|
2006-05-05 20:32:02 +02:00
|
|
|
ma_range.c ma_dbug.c ma_checksum.c \
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_changed.c ma_static.c ma_delete_all.c \
|
|
|
|
ma_delete_table.c ma_rename.c ma_check.c \
|
|
|
|
ma_keycache.c ma_preload.c ma_ft_parser.c \
|
|
|
|
ma_ft_update.c ma_ft_boolean_search.c \
|
2006-09-07 11:12:37 +02:00
|
|
|
ma_ft_nlq_search.c ma_sort.c \
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c \
|
2006-09-01 17:53:10 +02:00
|
|
|
ma_sp_key.c \
|
|
|
|
ma_control_file.c
|
|
|
|
CLEANFILES = test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? maria_control
|
2006-04-11 15:45:10 +02:00
|
|
|
DEFS =
|
|
|
|
|
|
|
|
SUFFIXES = .sh
|
|
|
|
|
|
|
|
.sh:
|
|
|
|
@RM@ -f $@ $@-t
|
|
|
|
@SED@ \
|
|
|
|
-e 's!@''bindir''@!$(bindir)!g' \
|
|
|
|
-e 's!@''scriptdir''@!$(bindir)!g' \
|
|
|
|
-e 's!@''prefix''@!$(prefix)!g' \
|
|
|
|
-e 's!@''datadir''@!$(datadir)!g' \
|
|
|
|
-e 's!@''localstatedir''@!$(localstatedir)!g' \
|
|
|
|
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
|
|
|
-e 's!@''CC''@!@CC@!'\
|
|
|
|
-e 's!@''CXX''@!@CXX@!'\
|
|
|
|
-e 's!@''GXX''@!@GXX@!'\
|
|
|
|
-e 's!@''PERL''@!@PERL@!' \
|
|
|
|
-e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
|
|
|
|
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
|
|
|
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
|
|
|
-e 's!@''VERSION''@!@VERSION@!' \
|
|
|
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
|
|
|
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
|
|
|
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
|
|
|
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
|
|
|
-e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
|
|
|
|
-e 's!@''CHECK_PID''@!@CHECK_PID@!' \
|
|
|
|
-e 's!@''FIND_PROC''@!@FIND_PROC@!' \
|
|
|
|
-e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
|
|
|
|
-e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
|
|
|
|
-e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
|
|
|
|
-e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
|
|
|
|
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
|
|
|
|
-e 's!@''sysconfdir''@!@sysconfdir@!' \
|
|
|
|
-e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
|
|
|
|
-e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
|
|
|
|
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
|
|
|
|
-e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
|
|
|
|
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
|
|
|
|
-e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
|
|
|
|
-e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
|
|
|
|
-e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
|
|
|
|
$< > $@-t
|
|
|
|
@CHMOD@ +x $@-t
|
|
|
|
@MV@ $@-t $@
|
|
|
|
|
|
|
|
# Don't update the files from bitkeeper
|
|
|
|
%::SCCS/s.%
|