Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6ad44811
Commit
6ad44811
authored
Dec 06, 2010
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
ca94028a
0eae06c4
Changes
31
Show whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
10 additions
and
72 deletions
+10
-72
CMakeLists.txt
CMakeLists.txt
+9
-0
client/CMakeLists.txt
client/CMakeLists.txt
+0
-2
dbug/CMakeLists.txt
dbug/CMakeLists.txt
+0
-1
extra/CMakeLists.txt
extra/CMakeLists.txt
+0
-2
libmysql/CMakeLists.txt
libmysql/CMakeLists.txt
+0
-3
libmysqld/CMakeLists.txt
libmysqld/CMakeLists.txt
+0
-2
mysys/CMakeLists.txt
mysys/CMakeLists.txt
+0
-1
regex/CMakeLists.txt
regex/CMakeLists.txt
+0
-2
server-tools/CMakeLists.txt
server-tools/CMakeLists.txt
+0
-2
server-tools/instance-manager/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt
+0
-2
sql/CMakeLists.txt
sql/CMakeLists.txt
+1
-5
sql/examples/CMakeLists.txt
sql/examples/CMakeLists.txt
+0
-3
storage/archive/CMakeLists.txt
storage/archive/CMakeLists.txt
+0
-2
storage/blackhole/CMakeLists.txt
storage/blackhole/CMakeLists.txt
+0
-3
storage/csv/CMakeLists.txt
storage/csv/CMakeLists.txt
+0
-3
storage/example/CMakeLists.txt
storage/example/CMakeLists.txt
+0
-2
storage/federated/CMakeLists.txt
storage/federated/CMakeLists.txt
+0
-3
storage/heap/CMakeLists.txt
storage/heap/CMakeLists.txt
+0
-3
storage/ibmdb2i/CMakeLists.txt
storage/ibmdb2i/CMakeLists.txt
+0
-3
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/CMakeLists.txt
+0
-3
storage/maria/CMakeLists.txt
storage/maria/CMakeLists.txt
+0
-3
storage/maria/unittest/CMakeLists.txt
storage/maria/unittest/CMakeLists.txt
+0
-2
storage/myisam/CMakeLists.txt
storage/myisam/CMakeLists.txt
+0
-3
storage/myisammrg/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
+0
-2
storage/pbxt/CMakeLists.txt
storage/pbxt/CMakeLists.txt
+0
-3
storage/xtradb/CMakeLists.txt
storage/xtradb/CMakeLists.txt
+0
-2
strings/CMakeLists.txt
strings/CMakeLists.txt
+0
-2
tests/CMakeLists.txt
tests/CMakeLists.txt
+0
-1
unittest/mysys/CMakeLists.txt
unittest/mysys/CMakeLists.txt
+0
-3
unittest/mytap/CMakeLists.txt
unittest/mytap/CMakeLists.txt
+0
-2
vio/CMakeLists.txt
vio/CMakeLists.txt
+0
-2
No files found.
CMakeLists.txt
View file @
6ad44811
...
@@ -66,6 +66,15 @@ IF(EXTRA_DEBUG)
...
@@ -66,6 +66,15 @@ IF(EXTRA_DEBUG)
ADD_DEFINITIONS
(
-D EXTRA_DEBUG
)
ADD_DEFINITIONS
(
-D EXTRA_DEBUG
)
ENDIF
(
EXTRA_DEBUG
)
ENDIF
(
EXTRA_DEBUG
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFE_MUTEX"
)
OPTION
(
WITH_DEBUG_FULL
"Enable malloc debug library (only debug builds)"
OFF
)
IF
(
WITH_DEBUG_FULL
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC"
)
ENDIF
()
IF
(
ENABLED_DEBUG_SYNC
)
IF
(
ENABLED_DEBUG_SYNC
)
ADD_DEFINITIONS
(
-D ENABLED_DEBUG_SYNC
)
ADD_DEFINITIONS
(
-D ENABLED_DEBUG_SYNC
)
ENDIF
(
ENABLED_DEBUG_SYNC
)
ENDIF
(
ENABLED_DEBUG_SYNC
)
...
...
client/CMakeLists.txt
View file @
6ad44811
...
@@ -18,8 +18,6 @@ INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
...
@@ -18,8 +18,6 @@ INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
# any of the clients here would go beyond the client API and access the
# any of the clients here would go beyond the client API and access the
# Thread Local Storage directly.
# Thread Local Storage directly.
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/zlib
...
...
dbug/CMakeLists.txt
View file @
6ad44811
...
@@ -18,7 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbug)
...
@@ -18,7 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbug)
SET
(
DBUG_SOURCES dbug.c factorial.c sanity.c
)
SET
(
DBUG_SOURCES dbug.c factorial.c sanity.c
)
IF
(
NOT SOURCE_SUBLIBS
)
IF
(
NOT SOURCE_SUBLIBS
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
ADD_LIBRARY
(
dbug
${
DBUG_SOURCES
}
)
ADD_LIBRARY
(
dbug
${
DBUG_SOURCES
}
)
ENDIF
(
NOT SOURCE_SUBLIBS
)
ENDIF
(
NOT SOURCE_SUBLIBS
)
extra/CMakeLists.txt
View file @
6ad44811
...
@@ -14,8 +14,6 @@
...
@@ -14,8 +14,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
...
...
libmysql/CMakeLists.txt
View file @
6ad44811
...
@@ -14,9 +14,6 @@
...
@@ -14,9 +14,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
# Note that we don't link with the libraries "strings" or "mysys"
# Note that we don't link with the libraries "strings" or "mysys"
# here, instead we recompile the files needed and include them
# here, instead we recompile the files needed and include them
# directly. This means we don't have to worry here about if these
# directly. This means we don't have to worry here about if these
...
...
libmysqld/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
# Need to set USE_TLS, since __declspec(thread) approach to thread local
# Need to set USE_TLS, since __declspec(thread) approach to thread local
# storage does not work properly in DLLs.
# storage does not work properly in DLLs.
...
...
mysys/CMakeLists.txt
View file @
6ad44811
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
# Only the server link with this library, the client libraries and the client
# Only the server link with this library, the client libraries and the client
# executables all link with recompiles of source found in the "mysys" directory.
# executables all link with recompiles of source found in the "mysys" directory.
...
...
regex/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
...
...
server-tools/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
ADD_DEFINITIONS
(
-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER
)
ADD_DEFINITIONS
(
-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER
)
INCLUDE_DIRECTORIES
(
${
PROJECT_SOURCE_DIR
}
/include
${
PROJECT_SOURCE_DIR
}
/sql
INCLUDE_DIRECTORIES
(
${
PROJECT_SOURCE_DIR
}
/include
${
PROJECT_SOURCE_DIR
}
/sql
...
...
server-tools/instance-manager/CMakeLists.txt
View file @
6ad44811
...
@@ -14,8 +14,6 @@
...
@@ -14,8 +14,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
ADD_DEFINITIONS
(
-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER
)
ADD_DEFINITIONS
(
-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER
)
INCLUDE_DIRECTORIES
(
${
PROJECT_SOURCE_DIR
}
/include
${
PROJECT_SOURCE_DIR
}
/sql
INCLUDE_DIRECTORIES
(
${
PROJECT_SOURCE_DIR
}
/include
${
PROJECT_SOURCE_DIR
}
/sql
...
...
sql/CMakeLists.txt
View file @
6ad44811
...
@@ -14,11 +14,7 @@
...
@@ -14,11 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
ADD_DEFINITIONS
(
-DUSE_SYMDIR
)
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi"
)
SET
(
CMAKE_EXE_LINKER_FLAGS_DEBUG
"
${
CMAKE_EXE_LINKER_FLAGS_DEBUG
}
"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
...
...
sql/examples/CMakeLists.txt
View file @
6ad44811
...
@@ -13,9 +13,6 @@
...
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/sql
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/sql
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
${
CMAKE_SOURCE_DIR
}
/regex
)
${
CMAKE_SOURCE_DIR
}
/regex
)
...
...
storage/archive/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
SET
(
ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h
)
SET
(
ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h
)
...
...
storage/blackhole/CMakeLists.txt
View file @
6ad44811
...
@@ -13,9 +13,6 @@
...
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
SET
(
BLACKHOLE_SOURCES ha_blackhole.cc ha_blackhole.h
)
SET
(
BLACKHOLE_SOURCES ha_blackhole.cc ha_blackhole.h
)
...
...
storage/csv/CMakeLists.txt
View file @
6ad44811
...
@@ -13,9 +13,6 @@
...
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
SET
(
CSV_SOURCES ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h
)
SET
(
CSV_SOURCES ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h
)
MYSQL_STORAGE_ENGINE
(
CSV
)
MYSQL_STORAGE_ENGINE
(
CSV
)
\ No newline at end of file
storage/example/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
SET
(
EXAMPLE_SOURCES ha_example.cc
)
SET
(
EXAMPLE_SOURCES ha_example.cc
)
MYSQL_STORAGE_ENGINE
(
EXAMPLE
)
MYSQL_STORAGE_ENGINE
(
EXAMPLE
)
storage/federated/CMakeLists.txt
View file @
6ad44811
...
@@ -13,9 +13,6 @@
...
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
SET
(
FEDERATED_SOURCES ha_federated.cc
)
SET
(
FEDERATED_SOURCES ha_federated.cc
)
MYSQL_STORAGE_ENGINE
(
FEDERATED
)
MYSQL_STORAGE_ENGINE
(
FEDERATED
)
storage/heap/CMakeLists.txt
View file @
6ad44811
...
@@ -13,9 +13,6 @@
...
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
SET
(
HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c
SET
(
HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c
ha_heap.cc
ha_heap.cc
...
...
storage/ibmdb2i/CMakeLists.txt
View file @
6ad44811
...
@@ -13,9 +13,6 @@
...
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/sql
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/sql
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
...
...
storage/innodb_plugin/CMakeLists.txt
View file @
6ad44811
...
@@ -16,9 +16,6 @@
...
@@ -16,9 +16,6 @@
# This is the CMakeLists for InnoDB Plugin
# This is the CMakeLists for InnoDB Plugin
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
# Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
# Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
# CMakeLists.txt still needs to work with previous versions of MySQL.
# CMakeLists.txt still needs to work with previous versions of MySQL.
IF
(
MYSQL_VERSION_ID GREATER
"50137"
)
IF
(
MYSQL_VERSION_ID GREATER
"50137"
)
...
...
storage/maria/CMakeLists.txt
View file @
6ad44811
...
@@ -16,9 +16,6 @@ INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
...
@@ -16,9 +16,6 @@ INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/zlib
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/sql
${
CMAKE_SOURCE_DIR
}
/sql
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/regex
...
...
storage/maria/unittest/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/zlib
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/unittest/mytap
)
${
CMAKE_SOURCE_DIR
}
/unittest/mytap
)
...
...
storage/myisam/CMakeLists.txt
View file @
6ad44811
...
@@ -15,9 +15,6 @@
...
@@ -15,9 +15,6 @@
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
MYISAM_SOURCES ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c ft_stem.c
SET
(
MYISAM_SOURCES ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c ft_stem.c
ha_myisam.cc
ha_myisam.cc
ft_myisam.c
ft_myisam.c
...
...
storage/myisammrg/CMakeLists.txt
View file @
6ad44811
...
@@ -12,8 +12,6 @@
...
@@ -12,8 +12,6 @@
# You should have received a copy of the GNU General Public License
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/storage/mysql_storage_engine.cmake"
)
...
...
storage/pbxt/CMakeLists.txt
View file @
6ad44811
...
@@ -25,9 +25,6 @@
...
@@ -25,9 +25,6 @@
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMYSQL_SERVER"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMYSQL_SERVER"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DMYSQL_SERVER"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DMYSQL_SERVER"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DMYSQL_SERVER -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DMYSQL_SERVER -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/sql
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/sql
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
...
...
storage/xtradb/CMakeLists.txt
View file @
6ad44811
...
@@ -16,8 +16,6 @@
...
@@ -16,8 +16,6 @@
# This is the CMakeLists for InnoDB Plugin
# This is the CMakeLists for InnoDB Plugin
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
# Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
# Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
# CMakeLists.txt still needs to work with previous versions of MySQL.
# CMakeLists.txt still needs to work with previous versions of MySQL.
...
...
strings/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
...
...
tests/CMakeLists.txt
View file @
6ad44811
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
# About "mysqlclient_notls", see note in "client/CMakeLists.txt"
# About "mysqlclient_notls", see note in "client/CMakeLists.txt"
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
ADD_DEFINITIONS
(
"-DMYSQL_CLIENT"
)
ADD_DEFINITIONS
(
"-DMYSQL_CLIENT"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
...
...
unittest/mysys/CMakeLists.txt
View file @
6ad44811
...
@@ -13,9 +13,6 @@
...
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/unittest/mytap
)
${
CMAKE_SOURCE_DIR
}
/unittest/mytap
)
ADD_EXECUTABLE
(
bitmap-t bitmap-t.c
)
ADD_EXECUTABLE
(
bitmap-t bitmap-t.c
)
...
...
unittest/mytap/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
ADD_LIBRARY
(
mytap tap.c
)
ADD_LIBRARY
(
mytap tap.c
)
vio/CMakeLists.txt
View file @
6ad44811
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX"
)
ADD_DEFINITIONS
(
-DUSE_SYMDIR
)
ADD_DEFINITIONS
(
-DUSE_SYMDIR
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment