diff options
| author | unknown <bell@desktop.sanja.is.com.ua> | 2007-04-16 13:19:43 +0300 |
|---|---|---|
| committer | unknown <bell@desktop.sanja.is.com.ua> | 2007-04-16 13:19:43 +0300 |
| commit | e10fe77b0ac9a43ad795555c65391318ff7cc968 (patch) | |
| tree | e2ed09433088190ae567be9a0e523defae042456 /storage/maria/Makefile.am | |
| parent | 1bf0ed775431a5142e846e23330228468dcf140b (diff) | |
| parent | 39d64a1d2565b09307d11b2a665f3f2c6bc8106e (diff) | |
| download | mariadb-git-e10fe77b0ac9a43ad795555c65391318ff7cc968.tar.gz | |
Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak
into desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-test
include/maria.h:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/mf_keycaches.c:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
storage/maria/Makefile.am:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_close.c:
Auto merged
storage/maria/ma_dynrec.c:
Auto merged
storage/maria/ma_extra.c:
Auto merged
storage/maria/ma_info.c:
Auto merged
storage/maria/ma_keycache.c:
Auto merged
storage/maria/ma_locking.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_packrec.c:
Auto merged
storage/maria/ma_page.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
storage/maria/ma_panic.c:
Auto merged
storage/maria/ma_preload.c:
Auto merged
storage/maria/ma_static.c:
Auto merged
storage/maria/ma_test1.c:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/ma_test3.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/maria_ftdump.c:
Auto merged
storage/maria/maria_pack.c:
Auto merged
sql/handler.cc:
merge
storage/maria/ma_blockrec.c:
merge
storage/maria/ma_delete_all.c:
merge
Diffstat (limited to 'storage/maria/Makefile.am')
| -rw-r--r-- | storage/maria/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/Makefile.am b/storage/maria/Makefile.am index 78c711693d3..39160106a2c 100644 --- a/storage/maria/Makefile.am +++ b/storage/maria/Makefile.am @@ -111,7 +111,8 @@ libmaria_a_SOURCES = ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \ ma_ft_nlq_search.c ft_maria.c ma_sort.c \ ha_maria.cc trnman.c lockman.c tablockman.c \ ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c \ - ma_sp_key.c ma_control_file.c ma_loghandler.c + ma_sp_key.c ma_control_file.c ma_loghandler.c \ + ma_pagecache.c ma_pagecaches.c CLEANFILES = test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? SUFFIXES = .sh |