diff options
| author | unknown <guilhem@gbichot3.local> | 2006-10-10 16:59:50 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-10-10 16:59:50 +0200 |
| commit | abdc4682cdcb26b6980d4999ab6137a53643afbd (patch) | |
| tree | bd7955fb3af7ecb029891063d865ab76db91fcac /storage/myisam/Makefile.am | |
| parent | ef0ee7642ad986551495bd891ad78bcdb11c7fcf (diff) | |
| parent | 8e04cdb2dd1b5102e578c9c98b220a07857bfcbb (diff) | |
| download | mariadb-git-abdc4682cdcb26b6980d4999ab6137a53643afbd.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean
into gbichot3.local:/home/mysql_src/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
configure.in:
Auto merged
config/ac-macros/plugins.m4:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
unittest/Makefile.am:
Auto merged
BitKeeper/triggers/post-commit:
merge
include/my_base.h:
merge
libmysqld/Makefile.am:
merge
mysql-test/mysql-test-run.pl:
merge
mysys/Makefile.am:
merge
sql/Makefile.am:
merge
sql/handler.h:
merge
sql/item_func.h:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
merge
sql/set_var.cc:
merge
sql/set_var.h:
merge
sql/sql_class.h:
merge
storage/csv/ha_tina.cc:
merge
storage/myisam/Makefile.am:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisam/ha_myisam.h:
merge
storage/myisam/mi_check.c:
merge
storage/myisam/mi_delete.c:
merge
storage/myisam/mi_dynrec.c:
merge
storage/myisam/mi_packrec.c:
merge
storage/myisam/mi_unique.c:
merge
storage/myisam/mi_write.c:
merge
storage/myisam/myisamdef.h:
merge
Diffstat (limited to 'storage/myisam/Makefile.am')
| -rw-r--r-- | storage/myisam/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am index ad2302bf0eb..bc6c50f20b1 100644 --- a/storage/myisam/Makefile.am +++ b/storage/myisam/Makefile.am @@ -98,8 +98,8 @@ libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ mi_delete_table.c mi_rename.c mi_check.c \ mi_keycache.c mi_preload.c \ ft_parser.c ft_stopwords.c ft_static.c \ - ft_update.c ft_boolean_search.c ft_nlq_search.c sort.c \ - ha_myisam.cc \ + ft_update.c ft_boolean_search.c ft_nlq_search.c \ + sort.c ha_myisam.cc ft_myisam.c \ rt_index.c rt_key.c rt_mbr.c rt_split.c sp_key.c CLEANFILES = test?.MY? FT?.MY? isam.log mi_test_all rt_test.MY? sp_test.MY? |