diff options
| author | unknown <brian@zim.(none)> | 2006-08-19 10:23:22 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-19 10:23:22 -0700 |
| commit | d1c1dac8193053168032fe1792b014a51c0e7652 (patch) | |
| tree | 062459896af47cd55d827d7da71b11b4b43ce0c0 /storage/heap/Makefile.am | |
| parent | 39f1d9f411160beb20f367fec4d01f9721d7a513 (diff) | |
| download | mariadb-git-d1c1dac8193053168032fe1792b014a51c0e7652.tar.gz | |
Update to push all of merge into the merge storage directory.
storage/myisammrg/ha_myisammrg.h:
Rename: sql/ha_myisammrg.h -> storage/myisammrg/ha_myisammrg.h
storage/federated/CMakeLists.txt:
BitKeeper file /home/brian/mysql/arch-5.1/storage/federated/CMakeLists.txt
libmysqld/Makefile.am:
Removed mrg
sql/CMakeLists.txt:
Removed mrg
sql/Makefile.am:
Removed mrg
sql/handler.cc:
Removed mrg include (no longer needed)
sql/sql_cache.cc:
Updated include files
storage/heap/Makefile.am:
Formatting
storage/myisammrg/Makefile.am:
Updated makefile for mrg
storage/myisammrg/ha_myisammrg.cc:
Updated Makefile
Diffstat (limited to 'storage/heap/Makefile.am')
| -rw-r--r-- | storage/heap/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am index e8cbaa285ef..46565126b65 100644 --- a/storage/heap/Makefile.am +++ b/storage/heap/Makefile.am @@ -48,6 +48,8 @@ libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ hp_rkey.c hp_block.c \ ha_heap.cc \ hp_hash.c _check.c _rectest.c hp_static.c + + EXTRA_DIST = CMakeLists.txt # Don't update the files from bitkeeper |