Commit 49e38d31 authored by unknown's avatar unknown
Browse files

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
parent d94c7745

innobase/btr/btr0btr.c

+3 −3
Original line number Diff line number Diff line
@@ -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),

innobase/btr/btr0cur.c

+2 −2
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ btr_cur_search_to_nth_level( 
				/* 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

innobase/fil/fil0fil.c

+1 −1
Original line number Diff line number Diff line
@@ -4034,7 +4034,7 @@ fil_aio_wait( 
	if (os_aio_use_native_aio) {

		srv_set_io_thread_op_info(segment, "native aio handle");

#ifdef WIN_ASYNC_IO

		ret = os_aio_windows_handle(segment, 0, (void**) &fil_node,

		ret = os_aio_windows_handle(segment, 0, &fil_node,

					    &message, &type);

#elif defined(POSIX_ASYNC_IO)

		ret = os_aio_posix_handle(segment, &fil_node, &message);

innobase/ibuf/ibuf0ibuf.c

+1 −1
Original line number Diff line number Diff line
@@ -2810,7 +2810,7 @@ ibuf_insert_to_index_page( 
	ut_ad(ibuf_inside());

	ut_ad(dtuple_check_typed(entry));



	if (UNIV_UNLIKELY(index->table->comp != !!page_is_comp(page))) {

	if (UNIV_UNLIKELY(index->table->comp != (ibool)!!page_is_comp(page))) {

		fputs(

"InnoDB: Trying to insert a record from the insert buffer to an index page\n"

"InnoDB: but the 'compact' flag does not match!\n", stderr);

innobase/log/log0recv.c

+14 −7
Original line number Diff line number Diff line
@@ -768,7 +768,8 @@ recv_parse_or_apply_log_rec_body( 
	case MLOG_REC_INSERT: case MLOG_COMP_REC_INSERT:

		if (NULL != (ptr = mlog_parse_index(ptr, end_ptr,

				type == MLOG_COMP_REC_INSERT, &index))) {

			ut_a(!page||!!page_is_comp(page)==index->table->comp);

			ut_a(!page

			  || (ibool)!!page_is_comp(page)==index->table->comp);

			ptr = page_cur_parse_insert_rec(FALSE, ptr, end_ptr,

							index, page, mtr);

		}
@@ -776,7 +777,8 @@ recv_parse_or_apply_log_rec_body( 
	case MLOG_REC_CLUST_DELETE_MARK: case MLOG_COMP_REC_CLUST_DELETE_MARK:

		if (NULL != (ptr = mlog_parse_index(ptr, end_ptr,

			type == MLOG_COMP_REC_CLUST_DELETE_MARK, &index))) {

			ut_a(!page||!!page_is_comp(page)==index->table->comp);

			ut_a(!page

			  || (ibool)!!page_is_comp(page)==index->table->comp);

			ptr = btr_cur_parse_del_mark_set_clust_rec(ptr,

						end_ptr, index, page);

		}
@@ -796,7 +798,8 @@ recv_parse_or_apply_log_rec_body( 
	case MLOG_REC_UPDATE_IN_PLACE: case MLOG_COMP_REC_UPDATE_IN_PLACE:

		if (NULL != (ptr = mlog_parse_index(ptr, end_ptr,

			type == MLOG_COMP_REC_UPDATE_IN_PLACE, &index))) {

			ut_a(!page||!!page_is_comp(page)==index->table->comp);

			ut_a(!page

			  || (ibool)!!page_is_comp(page)==index->table->comp);

			ptr = btr_cur_parse_update_in_place(ptr, end_ptr,

							page, index);

		}
@@ -806,7 +809,8 @@ recv_parse_or_apply_log_rec_body( 
		if (NULL != (ptr = mlog_parse_index(ptr, end_ptr,

			type == MLOG_COMP_LIST_END_DELETE

			|| type == MLOG_COMP_LIST_START_DELETE, &index))) {

			ut_a(!page||!!page_is_comp(page)==index->table->comp);

			ut_a(!page

			  || (ibool)!!page_is_comp(page)==index->table->comp);

			ptr = page_parse_delete_rec_list(type, ptr, end_ptr,

							index, page, mtr);

		}
@@ -814,7 +818,8 @@ recv_parse_or_apply_log_rec_body( 
	case MLOG_LIST_END_COPY_CREATED: case MLOG_COMP_LIST_END_COPY_CREATED:

		if (NULL != (ptr = mlog_parse_index(ptr, end_ptr,

			type == MLOG_COMP_LIST_END_COPY_CREATED, &index))) {

			ut_a(!page||!!page_is_comp(page)==index->table->comp);

			ut_a(!page

			  || (ibool)!!page_is_comp(page)==index->table->comp);

			ptr = page_parse_copy_rec_list_to_created_page(ptr,

						end_ptr, index, page, mtr);

		}
@@ -822,7 +827,8 @@ recv_parse_or_apply_log_rec_body( 
	case MLOG_PAGE_REORGANIZE: case MLOG_COMP_PAGE_REORGANIZE:

		if (NULL != (ptr = mlog_parse_index(ptr, end_ptr,

				type == MLOG_COMP_PAGE_REORGANIZE, &index))) {

			ut_a(!page||!!page_is_comp(page)==index->table->comp);

			ut_a(!page

			  || (ibool)!!page_is_comp(page)==index->table->comp);

			ptr = btr_parse_page_reorganize(ptr, end_ptr, index,

								page, mtr);

		}
@@ -855,7 +861,8 @@ recv_parse_or_apply_log_rec_body( 
	case MLOG_REC_DELETE: case MLOG_COMP_REC_DELETE:

		if (NULL != (ptr = mlog_parse_index(ptr, end_ptr,

				type == MLOG_COMP_REC_DELETE, &index))) {

			ut_a(!page||!!page_is_comp(page)==index->table->comp);

			ut_a(!page

			  || (ibool)!!page_is_comp(page)==index->table->comp);

			ptr = page_cur_parse_delete_rec(ptr, end_ptr,

							index, page, mtr);

		}