Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql (50b43f85) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+15 −1

Original line number	Diff line number	Diff line
		@@ -46785,6 +46785,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.46::
		* News-3.23.45:: Changes in release 3.23.45
		* News-3.23.44:: Changes in release 3.23.44
		* News-3.23.43:: Changes in release 3.23.43
		@@ -46834,7 +46835,20 @@ not yet 100% confident in this code.
		* News-3.23.0:: Changes in release 3.23.0
		@end menu

		@node News-3.23.45, News-3.23.44, News-3.23.x, News-3.23.x
		@node News-3.23.46, News-3.23.45, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.46
		@itemize @bullet
		@item
		Fixed bug where one got an empty set instead of a DEADLOCK error when using
		BDB tables.
		@item
		One can now kill @code{ANALYZE},@code{REPAIR} and @code{OPTIMIZE TABLE} when
		the thread is waiting to get a lock on the table.
		@item
		Fixed race condition in @code{ANALYZE TABLE}.
		@end itemize

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
		AC_INIT(sql/mysqld.cc)
		AC_CANONICAL_SYSTEM
		# The Docs Makefile.am parses this line!
		AM_INIT_AUTOMAKE(mysql, 3.23.45)
		AM_INIT_AUTOMAKE(mysql, 3.23.46)
		AM_CONFIG_HEADER(config.h)

		PROTOCOL_VERSION=10

0 → 100644

+10 −0

+1 −0

+7 −7

Original line number	Diff line number	Diff line
		# test for bug reported by Mark Steele

		drop table if exists tblChange;
		CREATE TABLE tblCharge (
		drop table if exists t1;
		CREATE TABLE t1 (
		ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
		ServiceID int(10) unsigned DEFAULT '0' NOT NULL,
		ChargeDate date DEFAULT '0000-00-00' NOT NULL,
		@@ -19,16 +19,16 @@ DEFAULT 'New' NOT NULL,
		) type=BDB;

		BEGIN;
		INSERT INTO tblCharge
		INSERT INTO t1
		VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
		COMMIT;

		BEGIN;
		UPDATE tblCharge SET ChargeAuthorizationMessage = 'blablabla' WHERE
		UPDATE t1 SET ChargeAuthorizationMessage = 'blablabla' WHERE
		ChargeID = 1;
		COMMIT;

		INSERT INTO tblCharge
		INSERT INTO t1
		VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
		select * from tblCharge;
		drop table tblCharge;
		select * from t1;
		drop table t1;