diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-08-02 15:37:33 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-08-02 15:37:33 +0200 |
| commit | 39371b1bcbb6bad75ecad0c044bf7de63a549741 (patch) | |
| tree | bdf6feecf8d5d7a4329b50c709e550c9b8785c58 /libmysqld/lib_sql.cc | |
| parent | 88d913eb3e236601ff4bce115d45f2ce70c62cb0 (diff) | |
| download | mariadb-git-39371b1bcbb6bad75ecad0c044bf7de63a549741.tar.gz | |
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)
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 0ce9efca0cc..4a8387e9944 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -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 |