Commit 1fb6d4e6 authored by Jon Olav Hauglid's avatar Jon Olav Hauglid

Bug#22680706: 5.5 DOES NOT BUILD WITH GCC5

Fix the following two build warnings so that 5.5 can be compiled
with GCC5.

storage/innobase/dict/dict0crea.c:1143:21: error: logical not is only applied
to the left hand side of comparison [-Werror=logical-not-parentheses]
   ut_a(!node->index == (err != DB_SUCCESS));
                     ^
storage/innobase/log/log0recv.c:1770:20: error: logical not is only applied
to the left hand side of comparison [-Werror=logical-not-parentheses]
  ut_ad(!allow_ibuf == mutex_own(&log_sys->mutex));
                    ^
parent 20c3063c
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -1140,7 +1140,7 @@ dict_create_index_step( ...@@ -1140,7 +1140,7 @@ dict_create_index_step(
>= DICT_TF_FORMAT_ZIP); >= DICT_TF_FORMAT_ZIP);
node->index = dict_index_get_if_in_cache_low(index_id); node->index = dict_index_get_if_in_cache_low(index_id);
ut_a(!node->index == (err != DB_SUCCESS)); ut_a((node->index == NULL) == (err != DB_SUCCESS));
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -1767,7 +1767,7 @@ recv_apply_hashed_log_recs( ...@@ -1767,7 +1767,7 @@ recv_apply_hashed_log_recs(
goto loop; goto loop;
} }
ut_ad(!allow_ibuf == mutex_own(&log_sys->mutex)); ut_ad((!allow_ibuf) == mutex_own(&log_sys->mutex));
if (!allow_ibuf) { if (!allow_ibuf) {
recv_no_ibuf_operations = TRUE; recv_no_ibuf_operations = TRUE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment