diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-06-27 18:58:32 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-06-27 18:58:32 +0300 |
| commit | 49e38d31f7de5c0cbbf0f3489000f7eae89a5702 (patch) | |
| tree | 81564c87116b2e2ae04d2ea7c3e10a0ad896bd11 /innobase/btr | |
| parent | d94c77453104f9c5c0a3681a23195b8628e34558 (diff) | |
| download | mariadb-git-49e38d31f7de5c0cbbf0f3489000f7eae89a5702.tar.gz | |
Many files:
Remove compiler warnings on Windows - Bug #11580
innobase/btr/btr0btr.c:
Remove compiler warnings on Windows - Bug #11580
innobase/btr/btr0cur.c:
Remove compiler warnings on Windows - Bug #11580
innobase/fil/fil0fil.c:
Remove compiler warnings on Windows - Bug #11580
innobase/ibuf/ibuf0ibuf.c:
Remove compiler warnings on Windows - Bug #11580
innobase/log/log0recv.c:
Remove compiler warnings on Windows - Bug #11580
innobase/os/os0file.c:
Remove compiler warnings on Windows - Bug #11580
innobase/page/page0page.c:
Remove compiler warnings on Windows - Bug #11580
innobase/row/row0upd.c:
Remove compiler warnings on Windows - Bug #11580
Diffstat (limited to 'innobase/btr')
| -rw-r--r-- | innobase/btr/btr0btr.c | 6 | ||||
| -rw-r--r-- | innobase/btr/btr0cur.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c index 2d84586216a..c27fb73ff8d 100644 --- a/innobase/btr/btr0btr.c +++ b/innobase/btr/btr0btr.c @@ -143,7 +143,7 @@ btr_root_get( root_page_no = dict_tree_get_page(tree); root = btr_page_get(space, root_page_no, RW_X_LATCH, mtr); - ut_a(!!page_is_comp(root) == + ut_a((ibool)!!page_is_comp(root) == UT_LIST_GET_FIRST(tree->tree_indexes)->table->comp); return(root); @@ -2014,7 +2014,7 @@ btr_compress( page = btr_cur_get_page(cursor); tree = btr_cur_get_tree(cursor); comp = page_is_comp(page); - ut_a(!!comp == cursor->index->table->comp); + ut_a((ibool)!!comp == cursor->index->table->comp); ut_ad(mtr_memo_contains(mtr, dict_tree_get_lock(tree), MTR_MEMO_X_LOCK)); @@ -2508,7 +2508,7 @@ btr_index_rec_validate( return(TRUE); } - if (UNIV_UNLIKELY(!!page_is_comp(page) != index->table->comp)) { + if (UNIV_UNLIKELY((ibool)!!page_is_comp(page) != index->table->comp)) { btr_index_rec_validate_report(page, rec, index); fprintf(stderr, "InnoDB: compact flag=%lu, should be %lu\n", (ulong) !!page_is_comp(page), diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c index 4ae27f007d6..30e85e021bc 100644 --- a/innobase/btr/btr0cur.c +++ b/innobase/btr/btr0cur.c @@ -507,7 +507,7 @@ retry_page_get: /* x-latch the page */ page = btr_page_get(space, page_no, RW_X_LATCH, mtr); - ut_a(!!page_is_comp(page) + ut_a((ibool)!!page_is_comp(page) == index->table->comp); } @@ -1385,7 +1385,7 @@ btr_cur_parse_update_in_place( goto func_exit; } - ut_a(!!page_is_comp(page) == index->table->comp); + ut_a((ibool)!!page_is_comp(page) == index->table->comp); rec = page + rec_offset; /* We do not need to reserve btr_search_latch, as the page is only |