mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Makefile.am:
Add CMakeLists.txt to source distribution CMakeLists.txt: Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1 Manual merge from 5.0 (bug#30118) CMakeLists.txt, mysqlbinlog.cc, lib_sql.cc: No need to test on USING_CMAKE, it is the only Windows build client/mysqlbinlog.cc: No need to test on USING_CMAKE, it is the only Windows build libmysqld/CMakeLists.txt: No need to test on USING_CMAKE, it is the only Windows build libmysqld/lib_sql.cc: No need to test on USING_CMAKE, it is the only Windows build libmysqld/Makefile.am: Add CMakeLists.txt to source distribution libmysqld/examples/Makefile.am: Add CMakeLists.txt to source distribution sql/CMakeLists.txt: Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1 client/CMakeLists.txt: Manual merge from 5.0 (bug#30118) libmysql/CMakeLists.txt: Manual merge from 5.0 (bug#30118) mysys/CMakeLists.txt: Manual merge from 5.0 (bug#30118) zlib/CMakeLists.txt: Manual merge from 5.0 (bug#30118)
This commit is contained in:
@@ -28,11 +28,7 @@ extern "C"
|
||||
extern unsigned long max_allowed_packet, net_buffer_length;
|
||||
}
|
||||
|
||||
#if defined(__WIN__) && !defined(USING_CMAKE)
|
||||
#include "../sql/mysqld.cpp"
|
||||
#else
|
||||
#include "../sql/mysqld.cc"
|
||||
#endif
|
||||
|
||||
C_MODE_START
|
||||
|
||||
|
Reference in New Issue
Block a user