diff options
author | Michael Widenius <monty@askmonty.org> | 2012-08-15 09:34:18 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-08-15 09:34:18 +0300 |
commit | dd8bd2e4c38a3e052b48ba8704e8a7aa89affd74 (patch) | |
tree | 50638eb913312381ecd04329884f91e27763d3f0 /sql/item_subselect.cc | |
parent | b886cac7123bc37d055fecd49d9a30ce0c39da73 (diff) | |
download | mariadb-git-dd8bd2e4c38a3e052b48ba8704e8a7aa89affd74.tar.gz |
Fixed compiler warnings
sql/item_subselect.cc:
Added purecov info
sql/sql_select.cc:
Added cast
storage/innobase/handler/ha_innodb.cc:
Added cast
storage/xtradb/btr/btr0btr.c:
Added buf_block_get_frame_fast() to avoid compiler warning
storage/xtradb/handler/ha_innodb.cc:
Added cast
storage/xtradb/include/buf0buf.h:
Innodb has buf_block_get_frame(block) defined as (block)->frame.
Didn't want to do a big change to break xtradb as it may use block_get_frame() differently, so I mad this quick hack to patch one compiler warning.
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 8b9904ea260..cedc4ccb834 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -5169,13 +5169,17 @@ Ordered_key::cmp_keys_by_row_data(ha_rows a, ha_rows b) /* Fetch the rows for comparison. */ if ((error= tbl->file->ha_rnd_pos(tbl->record[0], rowid_a))) { + /* purecov: begin inspected */ tbl->file->print_error(error, MYF(ME_FATALERROR)); // Sets fatal_error return 0; + /* purecov: end */ } if ((error= tbl->file->ha_rnd_pos(tbl->record[1], rowid_b))) { + /* purecov: begin inspected */ tbl->file->print_error(error, MYF(ME_FATALERROR)); // Sets fatal_error return 0; + /* purecov: end */ } /* Compare the two rows by the corresponding values of the indexed @@ -5253,8 +5257,10 @@ int Ordered_key::cmp_key_with_search_key(rownum_t row_num) if ((error= tbl->file->ha_rnd_pos(tbl->record[0], cur_rowid))) { + /* purecov: begin inspected */ tbl->file->print_error(error, MYF(ME_FATALERROR)); // Sets fatal_error return 0; + /* purecov: end */ } for (uint i= 0; i < key_column_count; i++) |