Commit aa755c86 authored by unknown's avatar unknown
Browse files

Merge marko@build.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/k/mysql-4.0

parents 4c939a79 5055d66b
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -483,7 +483,12 @@ page_rec_get_next(
		fprintf(stderr,
"InnoDB: Next record offset is nonsensical %lu in record at offset %lu\n",
		(ulong)offs, (ulong)(rec - page));
	
		fprintf(stderr,
"\nInnoDB: rec address %lx, first buffer frame %lx\n"
"InnoDB: buffer pool high end %lx, buf fix count %lu\n",
				(ulong)rec, (ulong)buf_pool->frame_zero,
				(ulong)buf_pool->high_end,
				(ulong)buf_block_align(rec)->buf_fix_count);
		buf_page_print(page);

		ut_a(0);
+7 −1
Original line number Diff line number Diff line
@@ -3090,6 +3090,12 @@ row_search_for_mysql(
			ut_print_timestamp(stderr);
			buf_page_print(buf_frame_align(rec));
			fprintf(stderr,
"\nInnoDB: rec address %lx, first buffer frame %lx\n"
"InnoDB: buffer pool high end %lx, buf block fix count %lu\n",
				(ulong)rec, (ulong)buf_pool->frame_zero,
				(ulong)buf_pool->high_end,
				(ulong)buf_block_align(rec)->buf_fix_count);
			fprintf(stderr,
"InnoDB: Index corruption: rec offs %lu next offs %lu, page no %lu,\n"
"InnoDB: ",
				(ulint)(rec - buf_frame_align(rec)), next_offs,