Merge with 3.23.51 (bc035c71) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+4 −3

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ akishkin@work.mysql.com
		arjen@co3064164-a.bitbike.com
		arjen@fred.bitbike.com
		arjen@george.bitbike.com
		bar@bar.udmsearch.izhnet.ru
		bell@sanja.is.com.ua
		davida@isil.mysql.com
		heikki@donna.mysql.fi
		@@ -46,6 +47,8 @@ paul@central.snake.net
		paul@teton.kitebird.com
		peter@linux.local
		root@x3.internalnet
		salle@geopard.(none)
		salle@geopard.online.bg
		sasha@mysql.sashanet.com
		serg@serg.mysql.com
		serg@sergbook.mysql.com
		@@ -64,10 +67,8 @@ tonu@volk.internalnet
		tonu@x153.internalnet
		tonu@x3.internalnet
		venu@work.mysql.com
		walrus@mysql.com
		worm@altair.is.lan
		zak@balfor.local
		zak@linux.local
		salle@geopard.(none)
		walrus@mysql.com
		zgreant@mysql.com
		salle@geopard.online.bg

Docs/manual.ja.texi

+1 −1

Original line number	Diff line number	Diff line
		@@ -34271,7 +34271,7 @@ Some small changes to the join table optimizer to make some joins faster.
		@code{MYSQL} ととしてコールできず、この代わりに @code{mysql_field_count()} を
		使用しなくてはなりません。
		@item
		@code{LIBEWRAP} の追加; Patch by Henning P . Schmiedehausen.
		@code{LIBWRAP} の追加; Patch by Henning P . Schmiedehausen.
		@item
		Don't allow @code{AUTO_INCREMENT} for other than numerical columns.
		@item

Docs/manual.texi

+20 −3

Original line number	Diff line number	Diff line
		@@ -50610,11 +50610,28 @@ not yet 100% confident in this code.
		@appendixsubsec Changes in release 3.23.52
		@itemize @bullet
		@item
		Fixed bug with creating an auto-increment value on second part of a
		@code{UNIQUE()} key where first part could contain NULL values.
		@item
		Don't write slave-timeout reconnects to the error log.
		@item
		Fixed bug with slave net read timeouting
		@item
		Fixed bug in ALTERing TABLE of BDB type.
		@item
		Fixed bug when logging @code{LOAD DATA INFILE} to binary log with no
		active database.
		@item
		Fixed a bug in range optimiser (causing crashes).
		@item
		Fixed possible problem in replication when doing @code{DROP DATABASE} on a
		database with @code{InnoDB} tables.
		@item
		Fixed @code{mysql_info()} to return 0 for the 'Duplicates' value for
		@code{INSERT DELAYED IGNORE} statements.
		Fixed that @code{mysql_info()} returns 0 for 'Duplicates' when using
		@code{INSERT DELAYED IGNORE}.
		@item
		Added @code{-DHAVE_BROKEN_REALPATH} to the Mac OS X (darwin) compile
		options in @file{configure.in} to fix a failure under high load.
		@end itemize

		@node News-3.23.51, News-3.23.50, News-3.23.52, News-3.23.x
		@@ -53411,7 +53428,7 @@ All C client API macros are now functions to make shared libraries more
		reliable. Because of this, you can no longer call @code{mysql_num_fields()} on
		a @code{MYSQL} object, you must use @code{mysql_field_count()} instead.
		@item
		Added use of @code{LIBEWRAP}; patch by Henning P. Schmiedehausen.
		Added use of @code{LIBWRAP}; patch by Henning P. Schmiedehausen.
		@item
		Don't allow @code{AUTO_INCREMENT} for other than numerical columns.
		@item

bdb/dist/acconfig.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@
		#undef HAVE_MUTEX_WIN16
		#undef HAVE_MUTEX_WIN32
		#undef HAVE_MUTEX_X86_GCC_ASSEMBLY
		#undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY

		/* Define if building on QNX. */
		#undef HAVE_QNX

bdb/dist/aclocal/mutex.m4

+12 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,18 @@ AC_TRY_RUN([main(){
		}], [db_cv_mutex="x86/gcc-assembly"])
		fi

		dnl x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
		if test "$db_cv_mutex" = no; then
		AC_TRY_RUN([main(){
		#if defined(x86_64) \|\| defined(__x86_64__)
		#if defined(__GNUC__)
		exit(0);
		#endif
		#endif
		exit(1);
		}], [db_cv_mutex="x86_64/gcc-assembly"])
		fi

		dnl ia86/gcc: Linux
		if test "$db_cv_mutex" = no; then
		AC_TRY_RUN([main(){