Update to push all of merge into the merge storage directory.

libmysqld/Makefile.am

@@ -44,7 +44,7 @@ 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_myisam.cc ha_myisammrg.cc \
+	ha_myisam.cc \
 	ha_innodb.cc ha_ndbcluster.cc \
 	ha_ndbcluster_binlog.cc ha_partition.cc \
 	handler.cc sql_handler.cc \

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_myisam.cc ha_myisammrg.cc
+               filesort.cc gstream.cc  ha_myisam.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 
@@ -35,7 +35,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
                item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc 
                item_uniq.cc key.cc log.cc lock.cc log_event.cc message.rc 
                message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
-               ../storage/myisammrg/myrg_rnext_same.c mysqld.cc net_serv.cc 
+               mysqld.cc net_serv.cc 
                nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc 
                ../sql-common/pack.c parse_file.cc password.c procedure.cc 
                protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc 

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_myisam.h ha_myisammrg.h ha_partition.h \
+			ha_myisam.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_myisam.cc ha_myisammrg.cc \
+			ha_myisam.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 \

sql/handler.cc

@@ -24,7 +24,6 @@
 #include "mysql_priv.h"
 #include "rpl_filter.h"
 #include "ha_myisam.h"
-#include "ha_myisammrg.h"
 
 
 #include <myisampack.h>

sql/sql_cache.cc

@@ -299,12 +299,8 @@ TODO list:
 #include <m_ctype.h>
 #include <my_dir.h>
 #include <hash.h>
-#include "ha_myisammrg.h"
-#ifndef MASTER
-#include "../srclib/myisammrg/myrg_def.h"
-#else
+#include "../storage/myisammrg/ha_myisammrg.h"
 #include "../storage/myisammrg/myrg_def.h"
-#endif
 
 #ifdef EMBEDDED_LIBRARY
 #include "emb_qcache.h"

storage/federated/CMakeLists.txt

+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
+                    ${CMAKE_SOURCE_DIR}/extra/yassl/include)
+ADD_LIBRARY(federated ha_federated.cc)

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

storage/myisammrg/Makefile.am

@@ -14,15 +14,31 @@
 # 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
+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 =	libmyisammrg.a
-noinst_HEADERS =	myrg_def.h
+noinst_HEADERS =	myrg_def.h ha_myisammrg.h
+noinst_LIBRARIES =	libmyisammrg.a
 libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
 			myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
 			myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
 			myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
 			myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c \
+			ha_myisammrg.cc \
 			myrg_rnext_same.c
+
+
 EXTRA_DIST =		CMakeLists.txt
 
 # Don't update the files from bitkeeper

sql/ha_myisammrg.cc → storage/myisammrg/ha_myisammrg.cc

@@ -19,16 +19,13 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#define MYSQL_SERVER 1
 #include "mysql_priv.h"
+#include <mysql/plugin.h>
 #include <m_ctype.h>
 #include "ha_myisammrg.h"
-#ifndef MASTER
-#include "../srclib/myisammrg/myrg_def.h"
-#else
-#include "../storage/myisammrg/myrg_def.h"
-#endif
+#include "myrg_def.h"
 
-#include <mysql/plugin.h>
 
 /*****************************************************************************
 ** MyISAM MERGE tables