Moved heap into its own directory.

storage/heap/ha_heap.h:
  Rename: sql/ha_heap.h -> storage/heap/ha_heap.h
libmysqld/Makefile.am:
  Heap changes
sql/CMakeLists.txt:
  Removed ha_heap
sql/Makefile.am:
  Removed heap
sql/handler.cc:
  Removed unneeded include call
storage/heap/Makefile.am:
  Adjusted heap Makefile.am to include ha_heap.cc
storage/heap/ha_heap.cc:
  Added plugin header

7 files changed, 31 insertions, 13 deletions

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 9e85c46575d..9286f3688ac 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -44,8 +44,8 @@ libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \
 noinst_HEADERS =	embedded_priv.h emb_qcache.h
 
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
-	ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
-	ha_innodb.cc ha_federated.cc ha_ndbcluster.cc \
+	ha_myisam.cc ha_myisammrg.cc \
+	ha_innodb.cc ha_ndbcluster.cc \
 	ha_ndbcluster_binlog.cc ha_partition.cc \
 	handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b1a1d6bd513..7ec2f9fcd0f 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -27,7 +27,7 @@ ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER
 
 ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 
-               filesort.cc gstream.cc  ha_heap.cc ha_myisam.cc ha_myisammrg.cc
+               filesort.cc gstream.cc  ha_myisam.cc ha_myisammrg.cc
                ha_innodb.cc ha_partition.cc
                handler.cc hash_filo.cc hash_filo.h 
                hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 1d3cca1f626..5d514095076 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -49,7 +49,7 @@ noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			procedure.h sql_class.h sql_lex.h sql_list.h \
 			sql_map.h sql_string.h unireg.h \
 			sql_error.h field.h handler.h mysqld_suffix.h \
-			ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \
+			ha_myisam.h ha_myisammrg.h ha_partition.h \
 			ha_innodb.h  \
 			ha_ndbcluster.h ha_ndbcluster_binlog.h \
 			ha_ndbcluster_tables.h \
@@ -87,7 +87,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			unireg.cc des_key_file.cc \
 			discover.cc time.cc opt_range.cc opt_sum.cc \
 		   	records.cc filesort.cc handler.cc \
-			ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
+			ha_myisam.cc ha_myisammrg.cc \
 			ha_partition.cc ha_innodb.cc \
                         ha_ndbcluster.cc ha_ndbcluster_binlog.cc \
 			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
diff --git a/sql/handler.cc b/sql/handler.cc
index d67acf69d14..241de921f19 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -23,7 +23,6 @@
 
 #include "mysql_priv.h"
 #include "rpl_filter.h"
-#include "ha_heap.h"
 #include "ha_myisam.h"
 #include "ha_myisammrg.h"
 
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am
index 68dce9bca5f..e8cbaa285ef 100644
--- a/storage/heap/Makefile.am
+++ b/storage/heap/Makefile.am
@@ -14,21 +14,39 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include 
-LDADD =			libheap.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a
+MYSQLDATAdir =          $(localstatedir)
+MYSQLSHAREdir =         $(pkgdatadir)
+MYSQLBASEdir=           $(prefix)
+MYSQLLIBdir=            $(pkglibdir)
+INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
+			-I$(top_srcdir)/regex \
+			-I$(top_srcdir)/sql \
+                        -I$(srcdir)
+WRAPLIBS=
+
+LDADD =
+
+DEFS =                  @DEFS@
 pkglib_LIBRARIES =	libheap.a
 noinst_PROGRAMS	=	hp_test1 hp_test2
+noinst_LIBRARIES =	libheap.a
 hp_test1_LDFLAGS = @NOINST_LDFLAGS@
+hp_test1_LDADD =	libheap.a \
+			$(top_builddir)/mysys/libmysys.a \
+			$(top_builddir)/dbug/libdbug.a \
+			$(top_builddir)/strings/libmystrings.a
 hp_test2_LDFLAGS = @NOINST_LDFLAGS@
-noinst_HEADERS =	heapdef.h
+hp_test2_LDADD =	libheap.a \
+			$(top_builddir)/mysys/libmysys.a \
+			$(top_builddir)/dbug/libdbug.a \
+			$(top_builddir)/strings/libmystrings.a
+noinst_HEADERS =	heapdef.h ha_heap.h
 libheap_a_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
 			hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
 			hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
 			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
 			hp_rkey.c hp_block.c \
+			ha_heap.cc \
 			hp_hash.c _check.c _rectest.c hp_static.c
 EXTRA_DIST =		CMakeLists.txt
 
diff --git a/sql/ha_heap.cc b/storage/heap/ha_heap.cc
index 3a2027afaba..317f85d26f2 100644
--- a/sql/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -19,8 +19,9 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#define MYSQL_SERVER 1
 #include "mysql_priv.h"
-#include <myisampack.h>
+#include <mysql/plugin.h>
 #include "ha_heap.h"
 
 
diff --git a/sql/ha_heap.h b/storage/heap/ha_heap.h
index 00e59856f26..00e59856f26 100644
--- a/sql/ha_heap.h
+++ b/storage/heap/ha_heap.h