diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-12-05 12:21:33 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-12-05 12:21:33 +0200 |
| commit | e528fe79b8479000e1e4ed20de1682bc385ad82a (patch) | |
| tree | 8b8c21c6845e5128ba9abf45280d45216a3c528f /storage | |
| parent | 082b859d0d8afbe49be770c2f18cf39bbd939aa8 (diff) | |
| download | mariadb-git-e528fe79b8479000e1e4ed20de1682bc385ad82a.tar.gz | |
Fix gcc v5.compiler errors.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0crea.c | 2 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.c | 2 | ||||
| -rw-r--r-- | storage/xtradb/dict/dict0crea.c | 2 | ||||
| -rw-r--r-- | 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 dcbca492b08..dcce3c1dca1 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 46157687071..c4f23da85aa 100644 --- a/storage/innobase/log/log0recv.c +++ b/storage/innobase/log/log0recv.c @@ -1763,7 +1763,7 @@ loop: 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 f7663b999b7..4419287ad8b 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 cae36421c52..5ab5e4be29e 100644 --- a/storage/xtradb/log/log0recv.c +++ b/storage/xtradb/log/log0recv.c @@ -1840,7 +1840,7 @@ loop: 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; |