Skip to content

Fix compile w/ G++ 6.1.1 on Fedora 24 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix compile w/ G++ 6.1.1 on Fedora 24 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/maintainer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SET(MY_C_WARNING_FLAGS

# Common warning flags for G++ and Clang++
SET(MY_CXX_WARNING_FLAGS
"${MY_WARNING_FLAGS} -Woverloaded-virtual -Wno-unused-parameter")
"${MY_WARNING_FLAGS} -Woverloaded-virtual -Wno-unused-parameter -Wno-nonnull-compare")

# Extra warning flags for Clang++
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand Down
10 changes: 5 additions & 5 deletions rapid/plugin/x/mysqlxtest_src/mysqlx.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,12 +1526,12 @@ boost::shared_ptr<Row> Result::next()
if (m_state == ReadStmtOk)
read_stmt_ok();

if (m_state != ReadDone)
{
ret_val = read_row();
if (m_state != ReadDone)
{
ret_val = read_row();

if (m_state == ReadStmtOk)
read_stmt_ok();
if (m_state == ReadStmtOk)
read_stmt_ok();
}
}

Expand Down
2 changes: 1 addition & 1 deletion sql/sql_update.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ bool mysql_update(THD *thd,
TRG_EVENT_UPDATE, 0))
break; /* purecov: inspected */

found++;
found++;

if (!records_are_comparable(table) || compare_records(table))
{
Expand Down
2 changes: 1 addition & 1 deletion storage/innobase/fts/fts0fts.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6819,7 +6819,7 @@ fts_fake_hex_to_dec(
#ifdef _WIN32
sscanf(tmp_id, "%016llu", &dec_id);
#else
sscanf(tmp_id, "%016"PRIu64, &dec_id);
sscanf(tmp_id, "%016" PRIu64, &dec_id);
#endif /* _WIN32 */
ut_ad(ret == 1);

Expand Down
4 changes: 2 additions & 2 deletions storage/innobase/include/fts0priv.ic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fts_write_object_id(
/* Use this to construct old(5.6.14 and 5.7.3) windows
ambiguous aux table names */
DBUG_EXECUTE_IF("innodb_test_wrong_windows_fts_aux_table_name",
return(sprintf(str, "%016"PRIu64, id)););
return(sprintf(str, "%016" PRIu64, id)););

DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
return(sprintf(str, UINT64PFx, id)););
Expand All @@ -66,7 +66,7 @@ fts_write_object_id(
// FIXME: Use ut_snprintf(), so does following one.
return(sprintf(str, "%016llu", id));
#else /* _WIN32 */
return(sprintf(str, "%016"PRIu64, id));
return(sprintf(str, "%016" PRIu64, id));
#endif /* _WIN32 */
}

Expand Down