Commit 15120892 authored by unknown's avatar unknown
Browse files

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 9fa4492a 9396ef5b

innobase/buf/buf0lru.c

+3 −3
Original line number Diff line number Diff line
@@ -877,11 +877,11 @@ buf_LRU_block_remove_hashed_page( 
			(ulong) block->offset);

                if (buf_page_hash_get(block->space, block->offset)) {

                        fprintf(stderr,

"InnoDB: From hash table we find block %lx of %lu %lu which is not %lx\n",

                (ulong) buf_page_hash_get(block->space, block->offset),

"InnoDB: From hash table we find block %p of %lu %lu which is not %p\n",

		buf_page_hash_get(block->space, block->offset),

                (ulong) buf_page_hash_get(block->space, block->offset)->space,

                (ulong) buf_page_hash_get(block->space, block->offset)->offset,

		(ulong) block);

		block);

                }



#ifdef UNIV_DEBUG

innobase/dict/dict0dict.c

+3 −2
Original line number Diff line number Diff line
@@ -2292,8 +2292,9 @@ dict_scan_to( 
			/* Outside quotes: look for the keyword. */

			ulint	i;

			for (i = 0; string[i]; i++) {

				if (toupper((ulint)(ptr[i]))

					!= toupper((ulint)(string[i]))) {

				if (toupper((int)(unsigned char)(ptr[i]))

						!= toupper((int)(unsigned char)

						(string[i]))) {

					goto nomatch;

				}

			}

innobase/eval/eval0proc.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ for_step( 
{

	for_node_t*	node;

	que_node_t*	parent;

	int		loop_var_value;

	lint		loop_var_value;



	ut_ad(thr);

innobase/include/mem0mem.ic

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ mem_strdupq( 
	char*		dst;

	char*		d;

	const char*	s	= str;

	int		len	= strlen(str) + 3;

	size_t		len	= strlen(str) + 3;

	/* calculate the number of quote characters in the string */

	while((s = strchr(s, q)) != NULL) {

		s++;

innobase/include/page0page.ic

+4 −4
Original line number Diff line number Diff line
@@ -484,10 +484,10 @@ page_rec_get_next( 
"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,

"\nInnoDB: rec address %p, first buffer frame %p\n"

"InnoDB: buffer pool high end %p, buf fix count %lu\n",

				rec, buf_pool->frame_zero,

				buf_pool->high_end,

				(ulong)buf_block_align(rec)->buf_fix_count);

		buf_page_print(page);