Merge (6e247490) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ paul@teton.kitebird.com
		root@x3.internalnet
		sasha@mysql.sashanet.com
		serg@serg.mysql.com
		sinisa@rhols221.adsl.netsonic.fi
		tfr@sarvik.tfr.cafe.ee
		tim@bitch.mysql.fi
		tim@black.box

Docs/manual.texi

+29 −10

Original line number	Diff line number	Diff line
		@@ -9333,9 +9333,10 @@ You can force a MySQL client to use named pipes by specifying the
		@code{--pipe} option or by specifying @code{.} as the host name. Use the
		@code{--socket} option to specify the name of the pipe.

		Note that starting from 3.23.50, named pipes are only enabled if you start
		@code{mysqld} with @code{--enable-named-pipe}. This is because some users have
		experienced problems shutting down the MySQL server when named pipes are used.
		Note that starting from 3.23.50, named pipes are only enabled if mysqld is
		started with with @code{--enable-named-pipe}. This is because some users
		have experienced problems shutting down the MySQL server when one uses
		named pipes.

		You can test whether or not MySQL is working by executing the
		following commands:
		@@ -9614,8 +9615,8 @@ option to the new MySQL clients or create an option file
		host = localhost
		@end example

		Starting from 3.23.50, named pipes are only enabled if start mysqld with
		@code{--enable-named-pipe}.
		Starting from 3.23.50, named pipes are only enabled if mysqld is started
		with @code{--enable-named-pipe}.

		@item @code{Access denied for user} error
		If you get the error @code{Access denied for user: 'some-user@@unknown'
		@@ -14178,8 +14179,7 @@ which a not fully working lockd() (as on Linux) you will easily get
		mysqld to deadlock.

		@item --enable-named-pipe
		Enable support for named pipes; This only works on NT and newer windows
		versions.
		Enable support for named pipes (only on NT/Win2000/XP).

		@item -T, --exit-info
		This is a bit mask of different flags one can use for debugging the
		@@ -49310,6 +49310,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.51:: Changes in release 3.23.51
		* News-3.23.50:: Changes in release 3.23.50
		* News-3.23.49:: Changes in release 3.23.49
		* News-3.23.48:: Changes in release 3.23.48
		@@ -49364,18 +49365,36 @@ not yet 100% confident in this code.
		* News-3.23.0:: Changes in release 3.23.0
		@end menu

		@node News-3.23.50, News-3.23.49, News-3.23.x, News-3.23.x
		@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.
		@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
		@code{InnoDB} now retains foreign key constraints through @code{ALTER TABLE}
		and @code{CREATE/DROP INDEX}.
		@item
		@code{InnoDB} now allows foreign key constraints to be added through the
		@code{ALTER TABLE} syntax.
		@item
		@code{InnoDB} tables can now be set to automatically grow in size (autoextend).
		@item
		Our Linux RPMS and binaries are now compiled with @code{gcc} 3.0.4, which
		should make them a bit faster.
		@item
		Fixed some buffer overflow problems when reading startup parameters.
		@item
		Because of problems on shutdown we have now disabled named pipes on
		Windows by default. To override this, start @code{mysqld} with
		windows by default. One can enable named pipes by starting mysqld with
		@code{--enable-named-pipe}.
		@item
		Fixed bug when using @code{WHERE key_column = 'J' or key_column='j'}.

client/mysql.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@
		#include <signal.h>
		#include <violite.h>

		const char *VER="11.23";
		const char *VER="12.1";

		/* Don't try to make a nice table if the data is too big */
		#define MAX_COLUMN_LENGTH 1024
		@@ -467,12 +467,12 @@ static struct option long_options[] =
		{"no-auto-rehash",no_argument, 0, 'A'},
		{"no-beep", no_argument, 0, 'b'},
		{"no-named-commands", no_argument, 0, 'g'},
		{"no-tee", no_argument, 0, OPT_NOTEE},
		#ifndef __WIN__
		{"no-pager", no_argument, 0, OPT_NOPAGER},
		{"nopager", no_argument, 0, OPT_NOPAGER}, /* we are kind */
		{"pager", optional_argument, 0, OPT_PAGER},
		#endif
		{"no-tee", no_argument, 0, OPT_NOTEE},
		{"notee", no_argument, 0, OPT_NOTEE}, /* we are kind */
		{"tee", required_argument, 0, OPT_TEE},
		{"one-database", no_argument, 0, 'o'},
		@@ -558,7 +558,7 @@ and you are welcome to modify and redistribute it under the GPL license\n");
		still work from the first line.\n\
		-G, --enable-named-commands\n\
		Named commands are enabled. Opposite to -g.\n\
		-i, --ignore-space Ignore space after function names.\n\
		-i, --ignore-spaces Ignore spaces after function names.\n\
		-h, --host=... Connect to host.\n\
		-H, --html Produce HTML output.\n\
		-X, --xml Produce XML output.\n\

configure.in

+2 −6

Original line number	Diff line number	Diff line
		@@ -291,19 +291,15 @@ case "$target_os" in
		if test "$GCC" != "yes"; then
		# We are using built-in inline function
		CFLAGS="$CFLAGS -Kalloca"
		CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
		else
		CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
		fi
		CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
		;;
		sysv5OpenUNIX8*)
		if test "$GCC" != "yes"; then
		# We are using built-in inline function
		CFLAGS="$CFLAGS -Kalloca"
		CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
		else
		CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
		fi
		CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
		;;
		esac
		AC_SUBST(CC)

sql/item_func.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -2115,6 +2115,7 @@ bool Item_func_match::fix_fields(THD thd,struct st_table_list tlist)
		my_error(ER_WRONG_ARGUMENTS,MYF(0),"MATCH");
		return 1;
		}

		return 0;
		}