diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
| commit | dc0b8f7ada9df6ea4b40d28766a672581526d9d8 (patch) | |
| tree | 4b2b7364d1e622b3b02db3fb9d0c898fb9293a87 /sql/CMakeLists.txt | |
| parent | 702d559fd5e19e9d0ef462c50c2da97360fc9def (diff) | |
| parent | 9141bb587892f3bfb59f0aad5eb8ef38e4310199 (diff) | |
| download | mariadb-git-dc0b8f7ada9df6ea4b40d28766a672581526d9d8.tar.gz | |
merge of mysql-5.5 into mysql-5.5-wl1054
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 7a840ef6cad..0860adde652 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -71,10 +71,11 @@ SET (SQL_SOURCE sql_tablespace.cc events.cc ../sql-common/my_user.c partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc rpl_rli.cc rpl_mi.cc sql_servers.cc sql_audit.cc - sql_connect.cc scheduler.cc - sql_profile.cc event_parse_data.cc - sql_signal.cc rpl_handler.cc mdl.cc + sql_connect.cc scheduler.cc sql_partition_admin.cc + sql_profile.cc event_parse_data.cc sql_alter.cc + sql_signal.cc rpl_handler.cc mdl.cc sql_admin.cc transaction.cc sys_vars.cc sql_truncate.cc datadict.cc + sql_reload.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE}) @@ -271,8 +272,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE) COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_initial_db.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data - COMMAND ${CMAKE_COMMAND} -E touch initdb.dep - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep DEPENDS mysqld ) ADD_CUSTOM_TARGET(initial_database |