diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-17 19:32:14 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-17 19:32:14 +0100 |
| commit | d8d639b39e2d177d6dc7ee519326d1d3944e0d53 (patch) | |
| tree | d02a2237b2c459c7c03d3e376cba150da65776c1 /sql/CMakeLists.txt | |
| parent | 5d92d2d7cf4ba64bdd9eed8d843221a4a476915d (diff) | |
| parent | 4c04fa4df2fc28e8037eaaed7a4d01d6ce0ab37d (diff) | |
| download | mariadb-git-d8d639b39e2d177d6dc7ee519326d1d3944e0d53.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
configure.in:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 3cd2334d69e..37707fe3963 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -37,8 +37,7 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc ${PROJECT_SOURCE_DIR}/include/sql_state.h PROPERTIES GENERATED 1) -ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER - -D_CONSOLE -DHAVE_DLOPEN) +ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN) ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.cc ../libmysql/errmsg.c field.cc field_conv.cc |