diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec744e975c7..da528d5d293 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,9 @@ ENDIF(WITH_CSV_STORAGE_ENGINE)
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/example)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+IF(WITH_FEDERATED_STORAGE_ENGINE)
+  ADD_SUBDIRECTORY(storage/federated)
+ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 804ab4ad3f2..d752d905568 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -30,8 +30,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
             ../sql-common/pack.c ../sql/derror.cc ../sql/event_scheduler.cc
             ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc
             ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc
-            ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc
-            ../sql/ha_myisammrg.cc ${mysql_se_ha_src}
+            ../sql/gstream.cc ${mysql_se_ha_src}
             ../sql/handler.cc ../sql/hash_filo.cc
             ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc
             ../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc
@@ -80,6 +79,9 @@ ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(mysqlserver example)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+IF(WITH_FEDERATED_STORAGE_ENGINE)
+  ADD_DEPENDENCIES(mysqlserver federated)
+ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(mysqlserver innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 7550a7af622..132362c43d1 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -75,6 +75,9 @@ ENDIF(WITH_CSV_STORAGE_ENGINE)
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
   TARGET_LINK_LIBRARIES(mysqld example)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+IF(WITH_FEDERATED_STORAGE_ENGINE)
+  TARGET_LINK_LIBRARIES(mysqld federated)
+ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 IF(WITH_INNOBASE_STORAGE_ENGINE)
   TARGET_LINK_LIBRARIES(mysqld innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
diff --git a/sql/handler.cc b/sql/handler.cc
index 6fb70d95521..44c23f82b2b 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -3515,7 +3515,7 @@ int handler::ha_reset()
   /* Check that we have called all proper delallocation functions */
   DBUG_ASSERT((byte*) table->def_read_set.bitmap +
               table->s->column_bitmap_size ==
-              (char*) table->def_write_set.bitmap);
+              (byte*) table->def_write_set.bitmap);
   DBUG_ASSERT(bitmap_is_set_all(&table->s->all_set));
   DBUG_ASSERT(table->key_read == 0);
   /* ensure that ha_index_end / ha_rnd_end has been called */
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt
index 1dd131e6851..720bd7228f5 100644
--- a/storage/heap/CMakeLists.txt
+++ b/storage/heap/CMakeLists.txt
@@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/regex
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 ADD_LIBRARY(heap _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c
+				ha_heap.cc
 				hp_delete.c hp_extra.c hp_hash.c hp_info.c hp_open.c hp_panic.c
 				hp_rename.c hp_rfirst.c hp_rkey.c hp_rlast.c hp_rnext.c hp_rprev.c
 				hp_rrnd.c hp_rsame.c hp_scan.c hp_static.c hp_update.c hp_write.c)
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt
index 3a93f7d4637..a86eff9d764 100644
--- a/storage/myisammrg/CMakeLists.txt
+++ b/storage/myisammrg/CMakeLists.txt
@@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/regex
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 ADD_LIBRARY(myisammrg myrg_close.c myrg_create.c myrg_delete.c myrg_extra.c myrg_info.c
+				ha_myisammrg.cc
 				myrg_locking.c myrg_open.c myrg_panic.c myrg_queue.c myrg_range.c
 				myrg_rfirst.c myrg_rkey.c myrg_rlast.c myrg_rnext.c myrg_rnext_same.c
 				myrg_rprev.c myrg_rrnd.c myrg_rsame.c myrg_static.c myrg_update.c