Commit 5c94a164 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge with 3.23.47

parents 4c17825a 0f71e337
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -46442,6 +46442,7 @@ users use this code as the rest of the code and because of this we are
not yet 100% confident in this code.
@menu
* News-3.23.47::                Changes in release 3.23.47
* News-3.23.46::                Changes in release 3.23.46
* News-3.23.45::                Changes in release 3.23.45
* News-3.23.44::                Changes in release 3.23.44
@@ -46492,10 +46493,22 @@ not yet 100% confident in this code.
* News-3.23.0::                 Changes in release 3.23.0
@end menu
@node News-3.23.46, News-3.23.45, News-3.23.x, News-3.23.x
@node News-3.23.47, News-3.23.46, News-3.23.x, News-3.23.x
@appendixsubsec Changes in release 3.23.47
@itemize @bullet
@item
Fixed bug when using @code{t1 LEFT JOIN t2 ON t2.key=constant}.
@item
@code{mysqlconfig} now also work with binary (relocated) distributions.
@end itemize
@node News-3.23.46, News-3.23.45, News-3.23.47, News-3.23.x
@appendixsubsec Changes in release 3.23.46
@itemize @bullet
@item
InnoDB and BDB tables will now use index when doing an @code{ORDER BY}
on the whole table.
@item
Fixed bug where one got an empty set instead of a DEADLOCK error when using
BDB tables.
@item

build-tags

0 → 100755
+11 −0
Original line number Diff line number Diff line
#! /bin/sh

if [ ! -f configure.in ] ; then
 echo "$0 must be run from MySQL source root"
 exit 1
fi

rm -f TAGS
find -not -path \*SCCS\* -and \
 \( -name \*.cc -or -name \*.h -or -name \*.yy -or -name \*.c \) \
 -print -exec etags -o TAGS --append {} \; 
+8 −2
Original line number Diff line number Diff line
@@ -211,6 +211,9 @@ buf_block_align(

	block = buf_pool_get_nth_block(buf_pool, (ptr - frame_zero)
						>> UNIV_PAGE_SIZE_SHIFT);
	ut_a(block >= buf_pool->blocks);
	ut_a(block < buf_pool->blocks + buf_pool->max_size);

	return(block);
}	

@@ -235,6 +238,9 @@ buf_block_align_low(

	block = buf_pool_get_nth_block(buf_pool, (ptr - frame_zero)
						>> UNIV_PAGE_SIZE_SHIFT);
	ut_a(block >= buf_pool->blocks);
	ut_a(block < buf_pool->blocks + buf_pool->max_size);

	return(block);
}	

@@ -253,9 +259,9 @@ buf_frame_align(

	frame = ut_align_down(ptr, UNIV_PAGE_SIZE);

	ut_ad((ulint)frame
	ut_a((ulint)frame
		>= (ulint)(buf_pool_get_nth_block(buf_pool, 0)->frame));
	ut_ad((ulint)frame <= (ulint)(buf_pool_get_nth_block(buf_pool,
	ut_a((ulint)frame <= (ulint)(buf_pool_get_nth_block(buf_pool,
					buf_pool->max_size - 1)->frame));
	return(frame);
}
+7 −0
Original line number Diff line number Diff line
@@ -163,6 +163,13 @@ mlog_write_initial_log_record_fast(
	space = buf_block_get_space(block);
	offset = buf_block_get_page_no(block);

	if (space != 0 || offset > 0x8FFFFFFF) {
	        fprintf(stderr,
	"InnoDB: error: buffer page pointer %lx has nonsensical space id %lu\n"
	"InnoDB: or page no %lu\n", (ulint)ptr, space, offset);
	        ut_a(0);
	}

	mach_write_to_1(log_ptr, type);
	log_ptr++;	
	log_ptr += mach_write_compressed(log_ptr, space);
+3 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,9 @@ recv_parse_log_rec(

	new_ptr = mlog_parse_initial_log_record(ptr, end_ptr, type, space,
								page_no);
	if (!new_ptr) {
	/* Check that space id and page_no are sensible */

	if (!new_ptr || *space != 0 || *page_no > 0x8FFFFFFF) {

		return(0);
	}
Loading