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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 87b1b4d37a3..b0b32fab76b 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -18,8 +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 -DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER - -DEMBEDDED_LIBRARY) +ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_SERVER -DEMBEDDED_LIBRARY) # 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. |