[Commits] e528fe7: Fix gcc v5.compiler errors.

Jan Lindström jan.lindstrom at mariadb.com
Sat Dec 5 12:22:06 EET 2015


revision-id: e528fe79b8479000e1e4ed20de1682bc385ad82a (mariadb-5.5.46-14-ge528fe7)
parent(s): 082b859d0d8afbe49be770c2f18cf39bbd939aa8
committer: Jan Lindström
timestamp: 2015-12-05 12:21:33 +0200
message:

Fix gcc v5.compiler errors.

---
 storage/innobase/dict/dict0crea.c | 2 +-
 storage/innobase/log/log0recv.c   | 2 +-
 storage/xtradb/dict/dict0crea.c   | 2 +-
 storage/xtradb/log/log0recv.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c
index dcbca49..dcce3c1 100644
--- a/storage/innobase/dict/dict0crea.c
+++ b/storage/innobase/dict/dict0crea.c
@@ -1140,7 +1140,7 @@ dict_create_index_step(
 			>= DICT_TF_FORMAT_ZIP);
 
 		node->index = dict_index_get_if_in_cache_low(index_id);
-		ut_a(!node->index == (err != DB_SUCCESS));
+		ut_a(err == DB_SUCCESS ? node->index != NULL : node->index == NULL);
 
 		if (err != DB_SUCCESS) {
 
diff --git a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
index 4615768..c4f23da 100644
--- a/storage/innobase/log/log0recv.c
+++ b/storage/innobase/log/log0recv.c
@@ -1763,7 +1763,7 @@ recv_apply_hashed_log_recs(
 		goto loop;
 	}
 
-	ut_ad(!allow_ibuf == mutex_own(&log_sys->mutex));
+	ut_ad(allow_ibuf == FALSE ? mutex_own(&log_sys->mutex) : !mutex_own(&log_sys->mutex));
 
 	if (!allow_ibuf) {
 		recv_no_ibuf_operations = TRUE;
diff --git a/storage/xtradb/dict/dict0crea.c b/storage/xtradb/dict/dict0crea.c
index f7663b9..4419287 100644
--- a/storage/xtradb/dict/dict0crea.c
+++ b/storage/xtradb/dict/dict0crea.c
@@ -1255,7 +1255,7 @@ dict_create_index_step(
 			>= DICT_TF_FORMAT_ZIP);
 
 		node->index = dict_index_get_if_in_cache_low(index_id);
-		ut_a(!node->index == (err != DB_SUCCESS));
+		ut_a(err == DB_SUCCESS ? node->index != NULL : node->index == NULL);
 
 		if (err != DB_SUCCESS) {
 
diff --git a/storage/xtradb/log/log0recv.c b/storage/xtradb/log/log0recv.c
index cae3642..5ab5e4b 100644
--- a/storage/xtradb/log/log0recv.c
+++ b/storage/xtradb/log/log0recv.c
@@ -1840,7 +1840,7 @@ recv_apply_hashed_log_recs(
 		goto loop;
 	}
 
-	ut_ad(!allow_ibuf == mutex_own(&log_sys->mutex));
+	ut_ad(allow_ibuf == FALSE ? mutex_own(&log_sys->mutex) : !mutex_own(&log_sys->mutex));
 
 	if (!allow_ibuf) {
 		recv_no_ibuf_operations = TRUE;


More information about the commits mailing list