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
ac31894d
Commit
ac31894d
authored
May 20, 2014
by
John Esmet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support gcc 4.9 in cmake, fix uninitialized value warnings
parent
6658f899
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
cmake_modules/TokuSetupCompiler.cmake
cmake_modules/TokuSetupCompiler.cmake
+8
-0
ft/log_upgrade.cc
ft/log_upgrade.cc
+2
-2
ft/logger.cc
ft/logger.cc
+1
-1
No files found.
cmake_modules/TokuSetupCompiler.cmake
View file @
ac31894d
...
...
@@ -137,6 +137,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
set
(
CMAKE_C_FLAGS_RELEASE
"-g -O3
${
CMAKE_C_FLAGS_RELEASE
}
-UNDEBUG"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-g -O3
${
CMAKE_CXX_FLAGS_RELEASE
}
-UNDEBUG"
)
else
()
if
(
CMAKE_CXX_COMPILER_ID MATCHES GNU
)
## Versions of gcc >= 4.9.0 require special version of 'ar' and 'ranlib' for
## link-time optimizations to work properly.
if
(
NOT
(
CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"4.9.0"
))
set
(
CMAKE_AR
"gcc-ar"
)
set
(
CMAKE_RANLIB
"gcc-ranlib"
)
endif
()
endif
()
# we overwrite this because the default passes -DNDEBUG and we don't want that
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-flto -fuse-linker-plugin
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
-g -O3 -UNDEBUG"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-flto -fuse-linker-plugin
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
-g -O3 -UNDEBUG"
)
...
...
ft/log_upgrade.cc
View file @
ac31894d
...
...
@@ -321,8 +321,8 @@ toku_maybe_upgrade_log(const char *env_dir, const char *log_dir, LSN * lsn_of_cl
r
=
0
;
//Logs are up to date
else
{
FOOTPRINT
(
4
);
LSN
last_lsn
;
TXNID
last_xid
;
LSN
last_lsn
=
ZERO_LSN
;
TXNID
last_xid
=
TXNID_NONE
;
r
=
verify_clean_shutdown_of_log_version
(
log_dir
,
version_of_logs_on_disk
,
&
last_lsn
,
&
last_xid
);
if
(
r
!=
0
)
{
goto
cleanup
;
...
...
ft/logger.cc
View file @
ac31894d
...
...
@@ -621,7 +621,7 @@ int toku_logger_find_next_unused_log_file(const char *directory, long long *resu
if
(
d
==
0
)
return
get_error_errno
();
while
((
de
=
readdir
(
d
)))
{
if
(
de
==
0
)
return
get_error_errno
();
long
long
thisl
;
long
long
thisl
=
-
1
;
if
(
is_a_logfile
(
de
->
d_name
,
&
thisl
)
)
{
if
((
long
long
)
thisl
>
maxf
)
maxf
=
thisl
;
}
...
...
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