diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-23 21:13:26 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-23 21:13:26 +0200 |
| commit | ca42b36cc99fa0fb1d12a3150316bf3164909a07 (patch) | |
| tree | 09269afde6ea92811b9a270afbfa86d3dc42dcc2 /storage/maria/Makefile.am | |
| parent | b635df555adec7ebdc4cd40e102d51006c802639 (diff) | |
| parent | 345959c660d7401c9dc991a2c572ba145d6e199c (diff) | |
| download | mariadb-git-ca42b36cc99fa0fb1d12a3150316bf3164909a07.tar.gz | |
Merge with new version
storage/myisam/mi_rsamepos.c:
Auto merged
include/m_string.h:
Automatic merge
include/maria.h:
manual merge
include/my_base.h:
Automatic merge
include/my_sys.h:
Automatic merge
mysys/mf_keycache.c:
Automatic merge
mysys/my_pread.c:
Automatic merge
sql/filesort.cc:
Automatic merge
sql/gen_lex_hash.cc:
Automatic merge
sql/mysqld.cc:
Automatic merge
sql/uniques.cc:
Automatic merge
storage/maria/Makefile.am:
manual_merge
storage/maria/ha_maria.cc:
Automatic merge
storage/maria/ma_check.c:
manual merge
storage/maria/ma_close.c:
manual merge
storage/maria/ma_create.c:
manual merge
storage/maria/ma_delete.c:
manual merge
storage/maria/ma_delete_all.c:
Automatic merge
storage/maria/ma_dynrec.c:
manual merge
storage/maria/ma_extra.c:
Automatic merge
storage/maria/ma_ft_boolean_search.c:
manual merge
storage/maria/ma_init.c:
Automatic merge
storage/maria/ma_key.c:
manual merge
storage/maria/ma_keycache.c:
manual merge
storage/maria/ma_locking.c:
Automatic merge
storage/maria/ma_open.c:
manual merge
storage/maria/ma_packrec.c:
manual merge
storage/maria/ma_page.c:
Automatic merge
storage/maria/ma_range.c:
Automatic merge
storage/maria/ma_rkey.c:
manual merge
storage/maria/ma_rsamepos.c:
manual merge
storage/maria/ma_sort.c:
manual merge
storage/maria/ma_statrec.c:
Automatic merge
storage/maria/ma_test2.c:
Automatic merge
storage/maria/ma_test3.c:
Automatic merge
storage/maria/ma_test_all.sh:
Use new version
storage/maria/ma_unique.c:
Automatic merge
storage/maria/ma_update.c:
Automatic merge
storage/maria/ma_write.c:
manual merge
storage/maria/maria_chk.c:
manual merge
storage/maria/maria_def.h:
manual merge
Added length pointer to _ma_page_get_block_info()
storage/maria/maria_ftdump.c:
Automatic merge
storage/maria/maria_pack.c:
manual merge
storage/myisam/mi_check.c:
Automatic merge
storage/myisam/mi_create.c:
Automatic merge
storage/myisam/mi_test2.c:
Automatic merge
storage/myisam/sort.c:
Automatic 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 24636f139ab..d7a5fa97eee 100644 --- a/storage/maria/Makefile.am +++ b/storage/maria/Makefile.am @@ -54,7 +54,7 @@ noinst_PROGRAMS = ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test 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 trnman.h lockman.h tablockman.h \ - ma_control_file.h ha_maria.h + ma_control_file.h ha_maria.h ma_blockrec.h ma_test1_DEPENDENCIES= $(LIBRARIES) ma_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ @@ -98,6 +98,7 @@ libmaria_a_SOURCES = ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.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_blockrec.c ma_bitmap.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 \ |