Add embedded server build to the CMake build files.

cmakelists.txt:
  Move configure processing to top-level cmakelists.txt so that it can be
  shared by mysqld and libmysqld.
libmysqld/lib_sql.cc:
  Temporary #ifdef to allow building from both bitkeeper sources and windows source package.
libmysqld/libmysqld.def:
  Add export missing for test_libmysqld
sql/cmakelists.txt:
  Move configure processing to top-level cmakelists.txt so that it can be
  shared by mysqld and libmysqld.
sql/mysqld.cc:
  #ifdef out code that is not used, nor compiles, in embedded server.
strings/cmakelists.txt:
  Add some missing sources to fix embedded server build.

1 files changed, 55 insertions, 0 deletions

diff --git a/cmakelists.txt b/cmakelists.txt
index a5bdb1a7894..70b017c757d 100644
--- a/cmakelists.txt
+++ b/cmakelists.txt
@@ -5,6 +5,52 @@ INCLUDE(win/configure.data)
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
                ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
+
+IF(WITH_ARCHIVE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_ARCHIVE_STORAGE_ENGINE)
+  SET (mysql_se_htons "${mysql_se_htons}, &archive_hton")
+  SET (mysql_se_decls "${mysql_se_decls}, archive_hton")
+  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_archive.cc")
+ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
+IF(WITH_BLACKHOLE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_BLACKHOLE_STORAGE_ENGINE)
+  SET (mysql_se_htons "${mysql_se_htons}, &blackhole_hton")
+  SET (mysql_se_decls "${mysql_se_decls}, blackhole_hton")
+  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_blackhole.cc")
+ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
+IF(WITH_EXAMPLE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_EXAMPLE_STORAGE_ENGINE)
+  SET (mysql_se_htons "${mysql_se_htons}, &example_hton")
+  SET (mysql_se_decls "${mysql_se_decls}, example_hton")
+ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+IF(WITH_INNOBASE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
+  SET (mysql_se_htons "${mysql_se_htons}, &innobase_hton")
+  SET (mysql_se_decls "${mysql_se_decls}, innobase_hton")
+  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_innodb.cc")
+ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+IF(WITH_PARTITION_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_PARTITION_STORAGE_ENGINE)
+  SET (mysql_se_htons "${mysql_se_htons}, &partition_hton")
+  SET (mysql_se_decls "${mysql_se_decls}, partition_hton")
+  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_partition.cc")
+ENDIF(WITH_PARTITION_STORAGE_ENGINE)
+IF(WITH_FEDERATED_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
+  SET (mysql_se_htons "${mysql_se_htons}, &federated_hton")
+  SET (mysql_se_decls "${mysql_se_decls}, federated_hton")
+  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_federated.cc")
+ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
+IF(WITH_BERKELEY_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)
+  SET (mysql_se_htons "${mysql_se_htons}, &berkeley_hton")
+  SET (mysql_se_decls "${mysql_se_decls}, berkeley_hton")
+  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_berkeley.cc")
+ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
+
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in 
+               ${CMAKE_SOURCE_DIR}/sql/handlerton.cc @ONLY)
+
 SET(localstatedir "C:\\mysql\\data")
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh
                ${CMAKE_SOURCE_DIR}/support-files/my-huge.ini @ONLY)
@@ -17,6 +63,13 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-medium.cnf.sh
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh
                ${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY)
 
+IF(__NT__)
+  ADD_DEFINITIONS(-D __NT__)
+ENDIF(__NT__)
+IF(CYBOZU)
+  ADD_DEFINITIONS(-D CYBOZU)
+ENDIF(CYBOZU)
+
 # in some places we use DBUG_OFF
 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")
 SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")
@@ -85,3 +138,5 @@ ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(server-tools/instance-manager)
 ADD_SUBDIRECTORY(libmysql)
 ADD_SUBDIRECTORY(tests)
+ADD_SUBDIRECTORY(libmysqld)
+ADD_SUBDIRECTORY(libmysqld/examples)