diff options
| author | unknown <lenz@mysql.com> | 2004-02-04 12:44:34 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-02-04 12:44:34 +0100 |
| commit | 5185075ce6358c0b68360bb84f3b8bc6b99a7a36 (patch) | |
| tree | adc3e3beb1e1dee4745534b5d939bfec33d1dbca | |
| parent | 128fac05325940c118ed49a46276397c59925f66 (diff) | |
| parent | 595e46704f57e515e329aae5c4d3860c1160170b (diff) | |
| download | mariadb-git-5185075ce6358c0b68360bb84f3b8bc6b99a7a36.tar.gz | |
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | myisam/Makefile.am | 6 | ||||
| -rw-r--r-- | myisam/myisam_ftdump.c (renamed from myisam/ft_dump.c) | 0 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 1 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 5 |
5 files changed, 10 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 572f877a49f..356418e3617 100644 --- a/.bzrignore +++ b/.bzrignore @@ -542,3 +542,4 @@ hardcopy.0 scripts/make_sharedlib_distribution sql/udf_example.so man/*.1 +myisam/myisam_ftdump diff --git a/myisam/Makefile.am b/myisam/Makefile.am index aeb3b34ee15..97456edee8d 100644 --- a/myisam/Makefile.am +++ b/myisam/Makefile.am @@ -21,18 +21,18 @@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a pkglib_LIBRARIES = libmyisam.a -bin_PROGRAMS = myisamchk myisamlog myisampack +bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump myisamchk_DEPENDENCIES= $(LIBRARIES) myisamlog_DEPENDENCIES= $(LIBRARIES) myisampack_DEPENDENCIES=$(LIBRARIES) -noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 ft_dump #ft_test1 ft_eval +noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 #ft_test1 ft_eval noinst_HEADERS = myisamdef.h fulltext.h ftdefs.h ft_test1.h ft_eval.h mi_test1_DEPENDENCIES= $(LIBRARIES) mi_test2_DEPENDENCIES= $(LIBRARIES) mi_test3_DEPENDENCIES= $(LIBRARIES) #ft_test1_DEPENDENCIES= $(LIBRARIES) #ft_eval_DEPENDENCIES= $(LIBRARIES) -ft_dump_DEPENDENCIES= $(LIBRARIES) +myisam_ftdump_DEPENDENCIES= $(LIBRARIES) libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ mi_rnext.c mi_rnext_same.c \ mi_search.c mi_page.c mi_key.c mi_locking.c \ diff --git a/myisam/ft_dump.c b/myisam/myisam_ftdump.c index 69fef529fa9..69fef529fa9 100644 --- a/myisam/ft_dump.c +++ b/myisam/myisam_ftdump.c diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 300fc4a7020..c7945e31eda 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -100,6 +100,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \ isam/isamchk$BS isam/pack_isam$BS \ myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \ + myisam/myisam_ftdump$BS \ sql/mysqld$BS \ client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \ client/mysqldump$BS client/mysqlimport$BS \ diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index e25a8a40c71..3ee602e7504 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -467,6 +467,7 @@ fi %attr(755, root, root) %{_bindir}/isamlog %attr(755, root, root) %{_bindir}/my_print_defaults %attr(755, root, root) %{_bindir}/myisamchk +%attr(755, root, root) %{_bindir}/myisam_ftdump %attr(755, root, root) %{_bindir}/myisamlog %attr(755, root, root) %{_bindir}/myisampack %attr(755, root, root) %{_bindir}/mysql_convert_table_format @@ -572,6 +573,10 @@ fi # The spec file changelog only includes changes made to the spec file # itself %changelog +* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com> + +- added myisam_ftdump to the Server package + * Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com> - marked /etc/logrotate.d/mysql as a config file (BUG 2156) |