Merge from 3.23.48 tree (79796e98) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+6 −6

Original line number	Diff line number	Diff line
		@@ -5,13 +5,17 @@ Miguel@light.local
		Sinisa@sinisa.nasamreza.org
		ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
		arjen@co3064164-a.bitbike.com
		bell@sanja.is.com.ua
		davida@isil.mysql.com
		heikki@donna.mysql.fi
		jani@hynda.mysql.fi
		jani@janikt.pp.saunalahti.fi
		jani@rhols221.adsl.netsonic.fi
		jcole@abel.spaceapes.com
		jcole@main.burghcom.com
		jcole@sarvik.tfr.cafe.ee
		jcole@tetra.spaceapes.com
		kaj@work.mysql.com
		miguel@light.local
		monty@bitch.mysql.fi
		monty@donna.mysql.fi
		@@ -19,6 +23,7 @@ monty@hundin.mysql.fi
		monty@tik.mysql.fi
		monty@tramp.mysql.fi
		monty@work.mysql.com
		mwagner@cash.mwagner.org
		mwagner@evoq.mwagner.org
		paul@central.snake.net
		paul@teton.kitebird.com
		@@ -32,14 +37,9 @@ tim@hundin.mysql.fi
		tim@threads.polyesthetic.msg
		tim@white.box
		tim@work.mysql.com
		tom@basil-firewall.home.com
		tonu@hundin.mysql.fi
		tonu@volk.internalnet
		tonu@x153.internalnet
		tonu@x3.internalnet
		jcole@sarvik.tfr.cafe.ee
		venu@work.mysql.com
		bell@sanja.is.com.ua
		kaj@work.mysql.com
		mwagner@cash.mwagner.org
		tom@basil-firewall.home.com
		jani@rhols221.adsl.netsonic.fi

+13 −1

Original line number	Diff line number	Diff line
		@@ -48667,6 +48667,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.48:: Changes in release 3.23.48
		* 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
		@@ -48718,7 +48719,18 @@ not yet 100% confident in this code.
		* News-3.23.0:: Changes in release 3.23.0
		@end menu

		@node News-3.23.47, News-3.23.46, News-3.23.x, News-3.23.x
		@node News-3.23.48, News-3.23.47, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.48
		@itemize @bullet
		@item
		Fixed bug in complicated join with @code{const} tables.
		@item
		Added internal safety checks for InnoDB.
		@item
		@code{SHOW GRANTS} now shows @code{REFERENCES} instead of @code{REFERENCE}.
		@end itemize

		@node News-3.23.47, News-3.23.46, News-3.23.48, News-3.23.x
		@appendixsubsec Changes in release 3.23.47
		@itemize @bullet
		@item

+32 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,38 @@ dict_mutex_exit_for_mysql(void)
		mutex_exit(&(dict_sys->mutex));
		}

		/************************************************************************
		Increments the count of open MySQL handles to a table. */

		void
		dict_table_increment_handle_count(
		/==============================/
		dict_table_t* table) /* in: table */
		{
		mutex_enter(&(dict_sys->mutex));

		table->n_mysql_handles_opened++;

		mutex_exit(&(dict_sys->mutex));
		}

		/************************************************************************
		Decrements the count of open MySQL handles to a table. */

		void
		dict_table_decrement_handle_count(
		/==============================/
		dict_table_t* table) /* in: table */
		{
		mutex_enter(&(dict_sys->mutex));

		ut_a(table->n_mysql_handles_opened > 0);

		table->n_mysql_handles_opened--;

		mutex_exit(&(dict_sys->mutex));
		}

		/************************************************************************
		Gets the nth column of a table. */

+3 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,9 @@ dict_mem_table_create(
		table->n_def = 0;
		table->n_cols = n_cols + DATA_N_SYS_COLS;
		table->mem_fix = 0;

		table->n_mysql_handles_opened = 0;

		table->cached = FALSE;

		table->cols = mem_heap_alloc(heap, (n_cols + DATA_N_SYS_COLS)

+14 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,20 @@ Created 1/8/1996 Heikki Tuuri
		#include "ut0byte.h"
		#include "trx0types.h"

		/************************************************************************
		Increments the count of open MySQL handles to a table. */

		void
		dict_table_increment_handle_count(
		/==============================/
		dict_table_t* table); /* in: table */
		/************************************************************************
		Decrements the count of open MySQL handles to a table. */

		void
		dict_table_decrement_handle_count(
		/==============================/
		dict_table_t* table); /* in: table */
		/**************************************************************************
		Inits the data dictionary module. */