diff options
| author | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
| commit | f47e003e1bfc56c2bf5d0f144a35517f526b538b (patch) | |
| tree | e2bfb9834c6e558381465ed2f57a9d873a9b2c90 /sql/CMakeLists.txt | |
| parent | 51a92bbb03cc58ab8688fa9d8226afe32e6156ca (diff) | |
| parent | 9daa56fd5ce3ccd33c32b5a505ac1d2b2c437460 (diff) | |
| download | mariadb-git-f47e003e1bfc56c2bf5d0f144a35517f526b538b.tar.gz | |
Merged 5.1 with maria 5.1
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 25223f41b21..5da1285f29a 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -39,11 +39,11 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc ${PROJECT_SOURCE_DIR}/include/sql_state.h PROPERTIES GENERATED 1) -ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN) +ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN -DHAVE_EVENT_SCHEDULER) ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc - discover.cc ../libmysql/errmsg.c field.cc stacktrace.c stacktrace.h field_conv.cc + discover.cc ../libmysql/errmsg.c field.cc field_conv.cc filesort.cc gstream.cc ha_partition.cc handler.cc hash_filo.cc hash_filo.h @@ -75,7 +75,7 @@ ADD_EXECUTABLE(mysqld partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc rpl_rli.cc rpl_mi.cc sql_servers.cc sql_connect.cc scheduler.cc - sql_profile.cc + sql_profile.cc event_parse_data.cc ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h ${PROJECT_SOURCE_DIR}/include/mysqld_error.h |