Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 (176daf64) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+44 −6

Original line number	Diff line number	Diff line
		@@ -17477,6 +17477,7 @@ information and a description of what it means.
		* OPTIMIZE TABLE:: @code{OPTIMIZE TABLE} Syntax
		* ANALYZE TABLE:: @code{ANALYZE TABLE} Syntax
		* FLUSH:: @code{FLUSH} Syntax
		* RESET:: @code{RESET} Syntax
		* KILL:: @code{KILL} Syntax
		* SHOW:: @code{SHOW} Syntax
		@end menu
		@@ -17564,7 +17565,7 @@ If the table hasn't changed since the last @code{ANALYZE TABLE} command,
		the table will not be analysed again.


		@node FLUSH, KILL, ANALYZE TABLE, Database Administration
		@node FLUSH, RESET, ANALYZE TABLE, Database Administration
		@subsection @code{FLUSH} Syntax

		@findex FLUSH
		@@ -17605,7 +17606,9 @@ signal to the @code{mysqld} server.
		@item @code{PRIVILEGES} @tab Reloads the privileges from the grant tables in
		the @code{mysql} database.

		@item @code{TABLES} @tab Closes all open tables and force all tables in use to be closed.
		@item @code{QUERY CACHE} @tab Defragment the query cache to better utilize the memory. This command will not remove any queries from the cache.

		@item @code{TABLES} @tab Closes all open tables and force all tables in use to be closed. This also flushes the query cache.

		@item @code{[TABLE \| TABLES] table_name [,table_name...]} @tab Flushes only the given tables.

		@@ -17618,12 +17621,34 @@ You can also access each of the commands shown above with the @code{mysqladmin}
		utility, using the @code{flush-hosts}, @code{flush-logs}, @code{reload},
		or @code{flush-tables} commands.

		Take also a look at the @code{RESET} command used with
		replication. @xref{Replication SQL}.
		Take also a look at the @code{RESET} command used with replication.
		@xref{RESET}.

		@node RESET, KILL, FLUSH, Database Administration
		@subsection @code{RESET} Syntax

		@example
		FLUSH flush_option [,flush_option]
		@end example

		The @code{RESET} command is used to clear things. It also acts as an stronger
		version of the @code{FLUSH} command. @xref{FLUSH}.

		@node KILL, SHOW, FLUSH, Database Administration
		@multitable @columnfractions .15 .85
		@item @code{MASTER}
		@tab Deletes all binary logs listed in the index file, resetting the binlog
		index file to be empty. In pre-3.23.26 versions, @code{FLUSH MASTER} (Master)

		@item @code{SLAVE}
		@tab Makes the slave forget its replication position in the master
		logs. In pre 3.23.26 versions the command was called
		@code{FLUSH SLAVE}(Slave)

		@item @code{QUERY CACHE}
		@tab Removes all query results from the query cache.
		@end multitable

		@node KILL, SHOW, RESET, Database Administration
		@subsection @code{KILL} Syntax

		@findex KILL
		@@ -46417,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
		@@ -46467,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 {} \;

include/mysql_com.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -78,8 +78,9 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY,
		#define REFRESH_READ_LOCK 16384 /* Lock tables for read */
		#define REFRESH_FAST 32768 /* Intern flag */

		#define REFRESH_QUERY_CACHE 65536 /* flush query cache */
		#define REFRESH_QUERY_CACHE_FREE 0x10000L /* pack query cache */
		/* RESET (remove all queries) from query cache */
		#define REFRESH_QUERY_CACHE 65536
		#define REFRESH_QUERY_CACHE_FREE 0x20000L /* pack query cache */

		#define CLIENT_LONG_PASSWORD 1 /* new more secure passwords */
		#define CLIENT_FOUND_ROWS 2 /* Found instead of affected rows */

innobase/include/buf0buf.ic

+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);
		}

innobase/include/mtr0log.ic

+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);