Embedded Server doesn't build on Windows.

- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.


CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Remove leading space from various definitions.
  - Remove optimizations from RelWithDebInfo configuration for debugging.
  - Conditionally add the necessary build directories based on 
  EMBEDDED_ONLY flag.
BitKeeper/etc/ignore:
  Embedded Server doesn't build on Windows.
  - Ignore CMake's default configuration output directories.
  - Ignore autogenerated cmake_dummy.c file.
libmysql/client_settings.h:
  Embedded Server doesn't build on Windows.
  - Build fixup
libmysqld/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Update for recent changes.
libmysqld/libmysqld.def:
  Embedded Server doesn't build on Windows.
  - Export necessary methods.
libmysqld/examples/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Updated include directories.
  - test_libmysqld fixup.
  - Added mysqltest_embedded and mysql_client_test_embedded exes needed for
  testing.
sql/mysqld.cc:
  Embedded Server doesn't build on Windows.
  - Build fixup.
sql/sql_binlog.cc:
  Embedded Server doesn't build on Windows.
  - Build fixup.
sql-common/client.c:
  Embedded Server doesn't build on Windows.
  - Build fixup.
storage/federated/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/heap/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/innobase/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/myisam/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/myisam/ha_myisam.cc:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/myisammrg/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
win/configure.js:
  Embedded Server doesn't build on Windows.
  - Add EMBEDDED_ONLY build configuration.

3 files changed, 81 insertions, 45 deletions

diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 8a855ebdbf5..dd42bafcfe0 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -18,7 +18,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 
 # Need to set USE_TLS, since __declspec(thread) approach to thread local
 # storage does not work properly in DLLs.
-ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_SERVER -DEMBEDDED_LIBRARY)
+ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_SERVER)
 
 # The old Windows build method used renamed (.cc -> .cpp) source files, fails
 # in #include in lib_sql.cc. So disable that using the USING_CMAKE define.
@@ -38,47 +38,51 @@ SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
                             PROPERTIES GENERATED 1)
                             
 ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
-            ../client/get_password.c ../libmysql/errmsg.c
-            ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c
-            ../sql-common/my_time.c ../sql-common/my_user.c
-            ../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 ${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
-            ../sql/item_func.cc ../sql/item_geofunc.cc ../sql/item_row.cc
-            ../sql/item_strfunc.cc ../sql/item_subselect.cc ../sql/item_sum.cc
-            ../sql/item_timefunc.cc ../sql/item_uniq.cc ../sql/item_xmlfunc.cc
-            ../sql/key.cc ../sql/lock.cc ../sql/log.cc ../sql/log_event.cc
-            ../sql/mf_iocache.cc ../sql/my_decimal.cc ../sql/net_serv.cc
-            ../sql/opt_range.cc ../sql/opt_sum.cc ../sql/parse_file.cc
-            ../sql/procedure.cc ../sql/protocol.cc ../sql/records.cc
-            ../sql/repl_failsafe.cc ../sql/rpl_filter.cc ../sql/set_var.cc
-            ../sql/spatial.cc ../sql/sp_cache.cc ../sql/sp.cc
-            ../sql/sp_head.cc ../sql/sp_pcontext.cc ../sql/sp_rcontext.cc
-            ../sql/sql_acl.cc ../sql/sql_analyse.cc ../sql/sql_base.cc
-            ../sql/sql_cache.cc ../sql/sql_class.cc ../sql/sql_crypt.cc
-            ../sql/sql_cursor.cc ../sql/sql_db.cc ../sql/sql_delete.cc
-            ../sql/sql_derived.cc ../sql/sql_do.cc ../sql/sql_error.cc
-            ../sql/sql_handler.cc ../sql/sql_help.cc ../sql/sql_insert.cc
-            ../sql/sql_lex.cc ../sql/sql_list.cc ../sql/sql_load.cc
-            ../sql/sql_manager.cc ../sql/sql_map.cc ../sql/sql_parse.cc
-            ../sql/sql_partition.cc ../sql/sql_plugin.cc ../sql/sql_prepare.cc
-            ../sql/sql_rename.cc ../sql/sql_repl.cc ../sql/sql_select.cc
-            ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
-            ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
-            ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
-            ../sql/sql_update.cc ../sql/sql_view.cc 
-            ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
-            ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
-            ../sql/partition_info.cc ../sql/sql_locale.cc
-	    ../sql/sql_connect.cc ../sql/scheduler.cc
-            ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c
-            ../vio/viosslfactories.c
-            ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
-            ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)
+           ../libmysql/libmysql.c ../libmysql/errmsg.c ../client/get_password.c
+           ../sql-common/client.c ../sql-common/my_time.c 
+           ../sql-common/my_user.c ../sql-common/pack.c
+           ../sql/password.c ../sql/discover.cc ../sql/derror.cc 
+           ../sql/event_scheduler.cc ../sql/events.cc 
+           ../sql/event_data_objects.cc ../sql/event_queue.cc 
+           ../sql/event_db_repository.cc ../sql/field.cc ../sql/field_conv.cc
+           ../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc 
+           ../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 ../sql/item_func.cc 
+           ../sql/item_geofunc.cc ../sql/item_row.cc ../sql/item_strfunc.cc 
+           ../sql/item_subselect.cc ../sql/item_sum.cc ../sql/item_timefunc.cc 
+           ../sql/item_xmlfunc.cc ../sql/key.cc ../sql/lock.cc ../sql/log.cc 
+           ../sql/log_event.cc ../sql/mf_iocache.cc ../sql/my_decimal.cc 
+           ../sql/net_serv.cc ../sql/opt_range.cc ../sql/opt_sum.cc 
+           ../sql/parse_file.cc ../sql/procedure.cc ../sql/protocol.cc 
+           ../sql/records.cc ../sql/repl_failsafe.cc ../sql/rpl_filter.cc
+           ../sql/rpl_record.cc
+           ../sql/rpl_injector.cc ../sql/set_var.cc ../sql/spatial.cc 
+           ../sql/sp_cache.cc ../sql/sp.cc ../sql/sp_head.cc 
+           ../sql/sp_pcontext.cc ../sql/sp_rcontext.cc ../sql/sql_acl.cc 
+           ../sql/sql_analyse.cc ../sql/sql_base.cc ../sql/sql_cache.cc 
+           ../sql/sql_class.cc ../sql/sql_crypt.cc ../sql/sql_cursor.cc 
+           ../sql/sql_db.cc ../sql/sql_delete.cc ../sql/sql_derived.cc 
+           ../sql/sql_do.cc ../sql/sql_error.cc ../sql/sql_handler.cc 
+           ../sql/sql_help.cc ../sql/sql_insert.cc ../sql/sql_lex.cc 
+           ../sql/sql_list.cc ../sql/sql_load.cc ../sql/sql_locale.cc 
+           ../sql/sql_binlog.cc ../sql/sql_manager.cc ../sql/sql_map.cc 
+           ../sql/sql_parse.cc ../sql/sql_partition.cc ../sql/sql_plugin.cc 
+           ../sql/sql_prepare.cc ../sql/sql_rename.cc ../sql/sql_repl.cc 
+           ../sql/sql_select.cc ../sql/sql_servers.cc ../sql/sql_builtin.cc 
+           ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
+           ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
+           ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
+           ../sql/sql_update.cc ../sql/sql_view.cc 
+           ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
+           ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
+           ../sql/partition_info.cc ../sql/sql_locale.cc ../sql/sql_connect.cc 
+           ../sql/scheduler.cc
+           ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c
+           ../vio/viosslfactories.c
+           ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
+           ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)
+ADD_DEPENDENCIES(mysqldemb GenError)
 
 # Seems we cannot make a library without at least one source file. So use a
 # dummy empty file
@@ -86,14 +90,20 @@ FILE(WRITE cmake_dummy.c " ")
 
 ADD_LIBRARY(mysqlserver cmake_dummy.c)
 TARGET_LINK_LIBRARIES(mysqlserver wsock32)
-ADD_DEPENDENCIES(mysqlserver dbug mysys strings zlib mysqldemb regex myisam myisammrg
-                 heap yassl taocrypt)
+ADD_DEPENDENCIES(mysqlserver mysqldemb heap myisam myisammrg dbug mysys zlib strings mysqldemb regex
+                 yassl taocrypt vio)
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(mysqlserver archive)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(mysqlserver example)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+IF(WITH_BLACKHOLE_STORAGE_ENGINE)
+  TARGET_LINK_LIBRARIES(mysqlserver blackhole)
+ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
+IF(WITH_CSV_STORAGE_ENGINE)
+  TARGET_LINK_LIBRARIES(mysqlserver csv)
+ENDIF(WITH_CSV_STORAGE_ENGINE)
 IF(WITH_FEDERATED_STORAGE_ENGINE)
   ADD_DEPENDENCIES(mysqlserver federated)
 ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
@@ -104,3 +114,9 @@ ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def)
 TARGET_LINK_LIBRARIES(libmysqld wsock32)
 ADD_DEPENDENCIES(libmysqld mysqlserver)
+IF(WITH_ARCHIVE_STORAGE_ENGINE)
+  ADD_DEPENDENCIES(libmysqld archive)
+ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
+IF(WITH_BLACKHOLE_STORAGE_ENGINE)
+  TARGET_LINK_LIBRARIES(libmysqld blackhole)
+ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index b33b4740c93..59fa390399d 100644
--- a/libmysqld/examples/CMakeLists.txt
+++ b/libmysqld/examples/CMakeLists.txt
@@ -15,12 +15,24 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
+                    ${CMAKE_SOURCE_DIR}/libmysqld/release
+                    ${CMAKE_SOURCE_DIR}/regex
+                    ${CMAKE_SOURCE_DIR}/zlib                   
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 
 # Currently does not work with DBUG, there are missing symbols reported.
 ADD_DEFINITIONS(-DDBUG_OFF)
+ADD_DEFINITIONS(-DUSE_TLS)
 ADD_EXECUTABLE(test_libmysqld ../../client/completion_hash.cc
                ../../client/mysql.cc ../../client/readline.cc
                ../../client/sql_string.cc)
-TARGET_LINK_LIBRARIES(test_libmysqld yassl taocrypt zlib wsock32)
+TARGET_LINK_LIBRARIES(test_libmysqld mysys yassl taocrypt zlib dbug regex strings wsock32)
 ADD_DEPENDENCIES(test_libmysqld libmysqld)
+
+ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c)
+TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib dbug regex strings wsock32)
+ADD_DEPENDENCIES(mysqltest_embedded libmysqld)
+
+ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)
+TARGET_LINK_LIBRARIES(mysql_client_test_embedded dbug mysys yassl taocrypt zlib strings wsock32)
+ADD_DEPENDENCIES(mysql_client_test_embedded libmysqld)
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index 6f7800ee207..21e61da15a7 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -41,7 +41,9 @@ EXPORTS
 	mysql_commit
 	mysql_data_seek
 	mysql_debug
+	mysql_disable_rpl_parse
 	mysql_dump_debug_info
+	mysql_enable_rpl_parse
 	mysql_eof
 	mysql_errno
 	mysql_error
@@ -55,6 +57,7 @@ EXPORTS
 	mysql_field_seek
 	mysql_field_tell
 	mysql_free_result
+	mysql_get_character_set_info
 	mysql_get_client_info
 	mysql_get_host_info
 	mysql_get_proto_info
@@ -84,6 +87,8 @@ EXPORTS
 	mysql_rollback
 	mysql_row_seek
 	mysql_row_tell
+	mysql_rpl_parse_enabled
+	mysql_rpl_probe
 	mysql_select_db
 	mysql_send_query
 	mysql_shutdown
@@ -109,6 +114,7 @@ EXPORTS
 	get_tty_password
 	sql_protocol_typelib
 	mysql_get_server_version
+	mysql_set_character_set
 	mysql_sqlstate
 	charsets_dir
 	disabled_my_option
@@ -133,6 +139,8 @@ EXPORTS
 	my_read
 	llstr
 	mysql_get_parameters
+	mysql_thread_init
+	mysql_thread_end
 	mysql_stmt_bind_param
 	mysql_stmt_bind_result
 	mysql_stmt_execute