Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql (899831d2) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		ccarkner@nslinuxw10.bedford.progress.com
		heikki@donna.mysql.fi
		sasha@mysql.sashanet.com
		monty@donna.mysql.fi

Docs/manual.texi

+18 −4

Original line number	Diff line number	Diff line
		@@ -407,6 +407,7 @@ MySQL Language Reference
		* COMMIT:: @code{BEGIN/COMMIT/ROLLBACK} syntax
		* LOCK TABLES:: @code{LOCK TABLES/UNLOCK TABLES} syntax
		* SET OPTION:: @code{SET OPTION} syntax
		* SET TRANSACTION:: @code{SET TRANSACTION} syntax
		* GRANT:: @code{GRANT} and @code{REVOKE} syntax
		* CREATE INDEX:: @code{CREATE INDEX} syntax
		* DROP INDEX:: @code{DROP INDEX} syntax
		@@ -420,7 +421,7 @@ Literals: How to Write Strings and Numbers
		* Number syntax:: Numbers
		* Hexadecimal values:: Hexadecimal values
		* NULL values:: @code{NULL} values
		* Legal names:: Database, table, index, column and alias names
		* Legal names:: Database, Table, Index, Column, and Alias Names

		Database, Table, Index, Column, and Alias Names

		@@ -898,6 +899,8 @@ Changes in release 4.0.x (Development; Alpha)

		Changes in release 3.23.x (Stable)

		* News-3.23.37::
		* News-3.23.36:: Changes in release 3.23.36
		* News-3.23.35:: Changes in release 3.23.35
		* News-3.23.34a:: Changes in release 3.23.34a
		* News-3.23.34:: Changes in release 3.23.34
		@@ -42376,6 +42379,7 @@ users uses 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.37:: Changes in release 3.23.37
		* News-3.23.36:: Changes in release 3.23.36
		* News-3.23.35:: Changes in release 3.23.35
		* News-3.23.34a:: Changes in release 3.23.34a
		@@ -42416,7 +42420,17 @@ not yet 100 % confident in this code.
		* News-3.23.0:: Changes in release 3.23.0
		@end menu

		@node News-3.23.36, News-3.23.35, News-3.23.x, News-3.23.x
		@node News-3.23.37, News-3.23.36, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.37
		@itemize @bullet
		@item
		Fixed bug in @code{ALTER TABLE} and @code{LOAD DATA INFILE} that disabled
		key-sorting. These command should now be faster in most cases.
		@item
		Initialize signals early to avoid problem with signals in Innobase..
		@end itemize

		@node News-3.23.36, News-3.23.35, News-3.23.37, News-3.23.x
		@appendixsubsec Changes in release 3.23.36
		@itemize @bullet
		@item
		@@ -42429,8 +42443,8 @@ of connections in a short time).
		Don't free the key cache on @code{FLUSH TABLES} as this will cause problems
		with temporary tables.
		@item
		Fixed problem in Innobase with with other character sets than latin1,
		alarms on Solaris and many columns.
		Fixed a problem in Innobase with with other character sets than
		latin1 and another problem when using many columns.
		@item
		Fixed a core-dump bug when using very complex query involving
		@code{DISTINCT} and summary functions.

include/myisam.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,8 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
		int test_if_almost_full(MI_INFO *info);
		int recreate_table(MI_CHECK param, MI_INFO org_info, char filename);
		void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows);
		my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, my_bool force);
		my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, ulonglong key_map,
		my_bool force);

		#ifdef __cplusplus
		}

myisam/mi_check.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -3166,12 +3166,18 @@ void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows)
		*/

		my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows,
		ulonglong key_map,
		my_bool force)
		{
		MYISAM_SHARE *share=info->s;
		uint i;
		MI_KEYDEF *key=share->keyinfo;
		if (!share->state.key_map)
		uint i;

		/*
		repair_by_sort only works if we have at least one key. If we don't
		have any keys, we should use the normal repair.
		*/
		if (!key_map)
		return FALSE; /* Can't use sort */
		for (i=0 ; i < share->base.keys ; i++,key++)
		{

myisam/myisamchk.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -693,6 +693,7 @@ static int myisamchk(MI_CHECK *param, my_string filename)
		(share->state.key_map \|\|
		(rep_quick && !param->keys_in_use && !recreate)) &&
		mi_test_if_sort_rep(info, info->state->records,
		info->s->state.key_map,
		check_param.force_sort))
		{
		error=mi_repair_by_sort(&check_param,info,fixed_name,rep_quick);