merge (727122aa) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ Sinisa@sinisa.nasamreza.org
		ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
		arjen@co3064164-a.bitbike.com
		arjen@fred.bitbike.com
		arjen@george.bitbike.com
		bell@sanja.is.com.ua
		davida@isil.mysql.com
		heikki@donna.mysql.fi
		@@ -20,6 +21,7 @@ jcole@sarvik.tfr.cafe.ee
		jcole@tetra.spaceapes.com
		jorge@linux.jorge.mysql.com
		kaj@work.mysql.com
		lenz@kallisto.mysql.com
		miguel@hegel.local
		miguel@light.local
		monty@bitch.mysql.fi
		@@ -51,5 +53,3 @@ tonu@x3.internalnet
		venu@work.mysql.com
		zak@balfor.local
		zak@linux.local
		arjen@george.bitbike.com
		lenz@kallisto.mysql.com

Docs/manual.texi

+22 −6

Original line number	Diff line number	Diff line
		@@ -30378,6 +30378,9 @@ stored into a temporary table) is calculated in MySQL Version
		@item expr2 or expr3 returns an integer @tab integer
		@end multitable

		If expr2 and expr3 are strings, then the result is case sensitive if
		both strings are case sensitive. (Starting from 3.23.51)

		@findex CASE
		@item CASE value WHEN [compare-value] THEN result [WHEN [compare-value] THEN result ...] [ELSE result] END
		@item CASE WHEN [condition] THEN result [WHEN [condition] THEN result ...] [ELSE result] END
		@@ -49420,19 +49423,32 @@ not yet 100% confident in this code.

		@node News-3.23.51, News-3.23.50, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.51

		@itemize @bullet
		@item
		Fixed @code{SIGINT} and @code{SIGQUIT} problems in @code{mysql}.
		@item
		Fixed bug in character table converts when used with big ( > 64K) strings.
		Fixed the result from @code{IF()} is case in-sensitive if the 2 and
		third arguments are case sensitive.
		@end itemize

		@node News-3.23.50, News-3.23.49, News-3.23.51, News-3.23.x
		@appendixsubsec Changes in release 3.23.50

		@itemize @bullet
		@item
		Fixed problem with @code{crash-me} and gcc 3.0.4.
		@item
		Fixed that @code{@@@@unknown_variable} doesn't hang server.
		@item
		Added @code{@@@@VERSION} as a synonym for @code{VERSION()}.
		@item
		@code{SHOW VARIABLES LIKE 'xxx'} is now case insensitive.
		@item
		Fixed timeout for @code{GET_LOCK()} on HPUX with DCE threads.
		@item
		Fixed memory allocation bug in the glibc library used to build Linux
		binaries, which caused mysqld to die in 'free()'.
		@item
		Fixed @code{SIGINT} and @code{SIGQUIT} problems in @code{mysql}.
		@item
		Fixed bug in character table converts when used with big ( > 64K) strings.
		@item
		@code{InnoDB} now retains foreign key constraints through @code{ALTER TABLE}
		and @code{CREATE/DROP INDEX}.
		@item

configure.in

+6 −6

Original line number	Diff line number	Diff line
		@@ -882,9 +882,9 @@ case $SYSTEM_TYPE in
		CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS";
		;;
		hpux10.20)
		echo "Enabling snprintf workaround for hpux 10.20"
		CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE"
		CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE"
		echo "Enabling workarounds for hpux 10.20"
		CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
		CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
		if test "$with_named_thread" = "no"
		then
		echo "Using --with-named-thread=-lpthread"
		@@ -892,9 +892,9 @@ case $SYSTEM_TYPE in
		fi
		;;
		hpux11.)
		echo "Enabling pread/pwrite workaround for hpux 11"
		CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS"
		CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS"
		echo "Enabling workarounds for hpux 11"
		CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
		CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
		if test "$with_named_thread" = "no"
		then
		echo "Using --with-named-thread=-lpthread"

dbug/Makefile.am

+4 −3

Original line number	Diff line number	Diff line
		@@ -20,8 +20,9 @@ LDADD = libdbug.a ../strings/libmystrings.a
		pkglib_LIBRARIES = libdbug.a
		noinst_HEADERS = dbug_long.h
		libdbug_a_SOURCES = dbug.c sanity.c
		EXTRA_DIST = example1.c example2.c example3.c user.r monty.doc readme.prof \
		main.c factorial.c
		EXTRA_DIST = example1.c example2.c example3.c \
		user.r monty.doc readme.prof \
		main.c factorial.c dbug_analyze.c

		OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
		__math.h time.h __time.h unistd.h __unistd.h types.h \
		@@ -32,7 +33,7 @@ OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
		sleep.h specific.h version.h pwd.h timers.h uio.h \
		cdefs.h machdep.h signal.h __signal.h util.h

		# Must be linked with libs thta are not compiled yet
		# Must be linked with libs that are not compiled yet
		extra_progs: factorial dbug_analyze

		factorial: main.o factorial.o

dbug/monty.doc

+8 −0

Original line number	Diff line number	Diff line
		@@ -10,3 +10,11 @@ giving a double ':'. (As in "O,c::\tmp\log")

		DBUG_DUMP("keyword",memory-position,length) writes a hexdump of the
		given memory-area to the outputfile.

		All changes that I or other people at MySQL AB have done to all files
		in the dbug library (Mainly in dbug.c, dbug_analyze.c, dbug_long.h,
		dbug.h) are put in public domain, as the rest of the dbug.c library)

		To my knowledge, all code in dbug library are in public domain.

		Michael Widenius