Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 (26b1bbdb) · Commits · Software / OSDI20 Artifacts / mariadb

Build-tools/Do-compile

+4 −4

Original line number	Diff line number	Diff line
		@@ -374,14 +374,14 @@ if ($opt_stage <= 9 && !$opt_no_test)
		log_system("rm -f output/*");
		$tmp= $opt_fast_benchmark ? "--fast --user root --small-test" : "";
		check_system("perl ./run-all-tests --log --die-on-errors $connect_option $tmp","RUN-mysql");
		if ($opt_bdb)
		{
		check_system("perl ./run-all-tests --log --suffix=\"_bdb\" --die-on-errors $connect_option $tmp --create-option=\"type=bdb\"","RUN-mysql");
		}
		if ($opt_innodb)
		{
		check_system("perl ./run-all-tests --log --suffix=\"_innodb\" --die-on-errors $connect_option $tmp --create-option=\"type=innodb\"","RUN-mysql");
		}
		if ($opt_bdb)
		{
		check_system("perl ./run-all-tests --log --suffix=\"_bdb\" --die-on-errors $connect_option $tmp --create-option=\"type=bdb\"","RUN-mysql");
		}
		}

		rm_all($bench_tmpdir);

Docs/manual.texi

+38 −1

Original line number	Diff line number	Diff line
		@@ -50797,6 +50797,9 @@ each individual 4.0.x release.
		@appendixsubsec Changes in release 4.0.5
		@itemize
		@item
		Fixed a newly introduced bug that caused @code{ORDER BY ... LIMIT #}
		to not return all rows.
		@item
		Fixed a bug in multi-table deletes when outer join is used on an empty
		table, which get's first to be deleted
		@item
		@@ -51589,6 +51592,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.54:: Changes in release 3.23.54
		* News-3.23.53:: Changes in release 3.23.53
		* News-3.23.52:: Changes in release 3.23.52 (14 Aug 2002)
		* News-3.23.51:: Changes in release 3.23.51 (31 May 2002)
		@@ -51646,12 +51650,45 @@ not yet 100% confident in this code.
		* News-3.23.0:: Changes in release 3.23.0 (05 Aug 1999: Alpha)
		@end menu

		@node News-3.23.53, News-3.23.52, News-3.23.x, News-3.23.x
		@node News-3.23.54, News-3.23.53, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.54
		@itemize
		@item
		Fixed reference to freed memory when doing complicated @code{GROUP BY
		... ORDER BY} queries. Symptom was that @code{mysqld} died in function
		@code{send_fields}.
		@item
		Allocate heap rows in smaller blocks to get better memory usage.
		@item
		Fixed memory allocation bug when storing BLOB values in internal
		temporary tables used for some (unlikely) @code{GROUP BY} queries.
		@item
		Fixed a bug in key optimizing handling where the expression
		@code{WHERE column_name = key_column_name} was calculated as true
		for @code{NULL} values.
		@item
		Fixed core dump bug when doing @code{LEFT JOIN ... WHERE key_column=NULL}.
		@end itemize

		@node News-3.23.53, News-3.23.52, News-3.23.54, News-3.23.x
		@appendixsubsec Changes in release 3.23.53
		@itemize @bullet
		@item
		Fixed crash when @code{SHOW INNODB STATUS} was used and @code{skip-innodb}
		was defined.
		@item
		Fixed possible memory corruption bug in binary log file handling when
		slave rotated the logs (only affected 3.23, not 4.0).
		@item
		Fixed problem in @code{LOCK TABLES} on windows when one connects to a
		database that contains upper case letters.
		@item
		Fixed that @code{--skip-show-databases} doesn't reset the @code{--port} option.
		@item
		Small fix in @code{safe_mysqld} for some shells.
		@item
		Fixed that @code{FLUSH STATUS} doesn't reset @code{Delayed_insert_threads}.
		@item
		Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}.
		@item
		Fixed core dump bug when using the @code{BINARY} cast on a @code{NULL} value.

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -737,7 +737,7 @@ AC_ARG_WITH(libwrap,

		_libs=${LIBS}
		AC_CHECK_HEADER(tcpd.h,
		LIBS="$LIBS -lwrap"
		LIBS="-lwrap $LIBS"
		AC_MSG_CHECKING(for TCP wrappers library -lwrap)
		AC_TRY_LINK([#include <tcpd.h>
		int allow_severity = 0;

heap/heapdef.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,17 @@
		#endif
		#include "heap.h" /* Structs & some defines */

		/*
		When allocating keys /rows in the internal block structure, do it
		within the following boundaries.

		The challenge is to find the balance between allocate as few blocks
		as possible and keep memory consumption down.
		*/

		#define HP_MIN_RECORDS_IN_BLOCK 16
		#define HP_MAX_RECORDS_IN_BLOCK 8192

		/* Some extern variables */

		extern LIST heap_open_list,heap_share_list;

heap/hp_open.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -162,8 +162,14 @@ static void init_block(HP_BLOCK *block, uint reclength, ulong min_records,
		max_records=1000; /* As good as quess as anything */
		recbuffer=(uint) (reclength+sizeof(byte)-1) & ~(sizeof(byte)-1);
		records_in_block=max_records/10;
		if (records_in_block < 10 && max_records)
		records_in_block=10;
		if (records_in_block < HP_MIN_RECORDS_IN_BLOCK && max_records)
		records_in_block= HP_MIN_RECORDS_IN_BLOCK;
		/*
		Don't allocate too many rows at one time too keep memory consumption
		done when we don't need it.
		*/
		if (records_in_block > HP_MAX_RECORDS_IN_BLOCK)
		records_in_block= HP_MAX_RECORDS_IN_BLOCK;
		if (!records_in_block \|\| records_in_block*recbuffer >
		(my_default_record_cache_size-sizeof(HP_PTRS)*HP_MAX_LEVELS))
		records_in_block=(my_default_record_cache_size-sizeof(HP_PTRS)*