From d1c1dac8193053168032fe1792b014a51c0e7652 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 19 Aug 2006 10:23:22 -0700 Subject: 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 --- storage/heap/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'storage/heap/Makefile.am') 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 -- cgit v1.2.1