diff options
| author | unknown <igor@rurik.mysql.com> | 2003-08-26 00:13:22 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-08-26 00:13:22 -0700 |
| commit | f6758b47fb75fb7f39e4883d53523bfda589adfd (patch) | |
| tree | 8f6c56f59666be1b54701f57e779e904575b1a4a /myisam/Makefile.am | |
| parent | 3b799e8fd8eb13c7ad6e2bb01a922e37d9101ea7 (diff) | |
| parent | b9a90dffb6c429ab405d036734b3b04b98df69d6 (diff) | |
| download | mariadb-git-f6758b47fb75fb7f39e4883d53523bfda589adfd.tar.gz | |
Manual merge
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_extra.c:
Auto merged
myisam/mi_locking.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/key_cache.result:
Auto merged
mysql-test/t/key_cache.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'myisam/Makefile.am')
| -rw-r--r-- | myisam/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/Makefile.am b/myisam/Makefile.am index d4cd953ac66..fdcfc6d0d41 100644 --- a/myisam/Makefile.am +++ b/myisam/Makefile.am @@ -47,7 +47,7 @@ libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ mi_range.c mi_dbug.c mi_checksum.c mi_log.c \ mi_changed.c mi_static.c mi_delete_all.c \ mi_delete_table.c mi_rename.c mi_check.c \ - mi_preload.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 \ rt_index.c rt_key.c rt_mbr.c rt_split.c sp_key.c |