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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a1d68faa
Commit
a1d68faa
authored
Mar 29, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMake : Move INNODB_DISALLOW_WRITES from top-level CMakeLists.txt to innodb
parent
55f4e480
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
CMakeLists.txt
CMakeLists.txt
+1
-7
storage/innobase/innodb.cmake
storage/innobase/innodb.cmake
+6
-0
No files found.
CMakeLists.txt
View file @
a1d68faa
...
...
@@ -235,12 +235,6 @@ MY_CHECK_AND_SET_COMPILER_FLAG(-ggdb3 DEBUG)
OPTION
(
ENABLED_LOCAL_INFILE
"If we should should enable LOAD DATA LOCAL by default"
${
IF_WIN
}
)
OPTION
(
WITH_INNODB_DISALLOW_WRITES
"InnoDB freeze writes patch from Google"
${
WITH_WSREP
}
)
IF
(
WITH_INNODB_DISALLOW_WRITES
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DWITH_INNODB_DISALLOW_WRITES"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DWITH_INNODB_DISALLOW_WRITES"
)
ENDIF
()
# Set DBUG_OFF and other optional release-only flags for non-debug project types
FOREACH
(
BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL
)
FOREACH
(
LANG C CXX
)
...
...
@@ -254,7 +248,7 @@ ENDFOREACH()
# Add safemutex for debug configurations, except on Windows
# (safemutex has never worked on Windows)
IF
(
NOT WIN32
AND NOT WITH_INNODB_MEMCACHED
)
IF
(
NOT WIN32
)
FOREACH
(
LANG C CXX
)
SET
(
CMAKE_
${
LANG
}
_FLAGS_DEBUG
"
${
CMAKE_
${
LANG
}
_FLAGS_DEBUG
}
-DSAFE_MUTEX"
)
ENDFOREACH
()
...
...
storage/innobase/innodb.cmake
View file @
a1d68faa
...
...
@@ -226,6 +226,12 @@ ELSE()
ADD_DEFINITIONS
(
-DMUTEX_SYS
)
ENDIF
()
OPTION
(
WITH_INNODB_DISALLOW_WRITES
"InnoDB freeze writes patch from Google"
${
WITH_WSREP
}
)
IF
(
WITH_INNODB_DISALLOW_WRITES
)
ADD_DEFINITIONS
(
-DWITH_INNODB_DISALLOW_WRITES
)
ENDIF
()
# Include directories under innobase
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/storage/innobase/include
${
CMAKE_SOURCE_DIR
}
/storage/innobase/handler
)
...
...
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