Commit e528fe79 authored by Jan Lindström's avatar Jan Lindström

Fix gcc v5.compiler errors.

parent 082b859d
...@@ -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(err == DB_SUCCESS ? node->index != NULL : node->index == NULL);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
......
...@@ -1763,7 +1763,7 @@ loop: ...@@ -1763,7 +1763,7 @@ loop:
goto 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) { if (!allow_ibuf) {
recv_no_ibuf_operations = TRUE; recv_no_ibuf_operations = TRUE;
......
...@@ -1255,7 +1255,7 @@ dict_create_index_step( ...@@ -1255,7 +1255,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(err == DB_SUCCESS ? node->index != NULL : node->index == NULL);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
......
...@@ -1840,7 +1840,7 @@ loop: ...@@ -1840,7 +1840,7 @@ loop:
goto 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) { 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