Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql (acf598c5) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@ sasha@mysql.sashanet.com
		heikki@donna.mysql.fi
		miguel@linux.local
		monty@tik.mysql.fi
		monty@donna.mysql.fi

Docs/manual.texi

+13 −20

Original line number	Diff line number	Diff line
		@@ -314,7 +314,6 @@ Windows Notes
		* Windows and SSH:: Connecting to a remote @strong{MySQL} from Windows with SSH
		* Windows symbolic links:: Splitting data across different disks under Win32
		* Windows compiling:: Compiling MySQL clients on Windows.
		* Windows and BDB tables.:: Windows and BDB Tables
		* Windows vs Unix:: @strong{MySQL}-Windows compared to Unix @strong{MySQL}

		Post-installation Setup and Testing
		@@ -8870,7 +8869,6 @@ This is also described in the @file{README} file that comes with the
		* Windows and SSH:: Connecting to a remote @strong{MySQL} from Windows with SSH
		* Windows symbolic links:: Splitting data across different disks under Win32
		* Windows compiling:: Compiling MySQL clients on Windows.
		* Windows and BDB tables.:: Windows and BDB Tables
		* Windows vs Unix:: @strong{MySQL}-Windows compared to Unix @strong{MySQL}
		@end menu

		@@ -8919,9 +8917,8 @@ symbolic links, BDB and InnoDB tables.
		@item @code{mysqld-opt} @tab
		Optimized binary with no support for transactional tables.
		@item @code{mysqld-nt} @tab
		Optimized for a Pentium Pro processor. Has support for
		named pipes. You can run this version on Win98, but in
		this case no named pipes are created and you must
		Optimized binary for NT with support for named pipes. You can run this
		version on Win98, but in this case no named pipes are created and you must
		have TCP/IP installed.
		@item @code{mysqld-max} @tab
		Optimized binary with support for symbolic links, BDB and InnoDB tables.
		@@ -9223,7 +9220,7 @@ text @code{D:\data\foo}. After that, all tables created in the database

		@cindex compiling, on Windows
		@cindex Windows, compiling on
		@node Windows compiling, Windows and BDB tables., Windows symbolic links, Windows
		@node Windows compiling, Windows vs Unix, Windows symbolic links, Windows
		@subsection Compiling MySQL Clients on Windows

		In your source files, you should include @file{windows.h} before you include
		@@ -9243,19 +9240,9 @@ with the static @file{mysqlclient.lib} library.
		Note that as the mysqlclient libraries are compiled as threaded libraries,
		you should also compile your code to be multi-threaded!

		@cindex BDB tables
		@cindex tables, BDB
		@node Windows and BDB tables., Windows vs Unix, Windows compiling, Windows
		@subsection Windows and BDB Tables

		We will shortly do a full test on the new BDB interface on Windows.
		When this is done we will start to release binary distributions (for
		Windows and Unix) of @strong{MySQL} that will include support for BDB
		tables.

		@cindex Windows, versus Unix
		@cindex operating systems, Windows versus Unix
		@node Windows vs Unix, , Windows and BDB tables., Windows
		@node Windows vs Unix, , Windows compiling, Windows
		@subsection MySQL-Windows Compared to Unix MySQL

		@strong{MySQL}-Windows has by now proven itself to be very stable. This version
		@@ -42718,7 +42705,7 @@ attachments, you should ftp all the relevant files to:
		@end itemize

		@node Reporting mysqltest bugs, , extending mysqltest, MySQL test suite
		@subsection Extending the MySQL Test Suite
		@subsection Reporting bugs in the MySQL Test Suite

		If your @strong{MySQL} version doesn't pass the test suite you should
		do the following:
		@@ -42749,6 +42736,10 @@ so that we can examine it. Please remember to also include a full
		description of your system, the version of the mysqld binary and how you
		compiled it.

		@item
		Try also to run @code{mysql-test-run} with the @code{--force} option to
		see if there is any other test that fails.

		@item
		If you have compiled @strong{MySQL} yourself, check our manual for how
		to compile @strong{MySQL} on your platform or, preferable, use one of
		@@ -44707,6 +44698,8 @@ not yet 100% confident in this code.
		@appendixsubsec Changes in release 3.23.39
		@itemize @bullet
		@item
		Fixed problem with @code{IF()} and number of decimals in the result.
		@item
		Fixed that date-part extract functions works with dates where day
		and/or month is 0.
		@item

client/mysqladmin.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#include <my_pthread.h> /* because of signal() */
		#endif

		#define ADMIN_VERSION "8.20"
		#define ADMIN_VERSION "8.21"
		#define MAX_MYSQL_VAR 64
		#define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */
		#define MAX_TRUNC_LENGTH 3
		@@ -870,7 +870,7 @@ static int drop_db(MYSQL mysql, const char db)
		return -1;
		}
		}
		sprintf(name_buff,"drop database %.*s",FN_REFLEN,db);
		sprintf(name_buff,"drop database `%.*s`",FN_REFLEN,db);
		if (mysql_query(mysql,name_buff))
		{
		my_printf_error(0,"DROP DATABASE %s failed;\nerror: '%s'",MYF(ME_BELL),

client/mysqlcheck.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ static int get_options(int argc, char **argv)
		{
		int pnlen = strlen(my_progname);

		if (pnlen < 6) // name too short
		if (pnlen < 6) /* name too short */
		what_to_do = DO_CHECK;
		else if (!strcmp("repair", my_progname + pnlen - 6))
		what_to_do = DO_REPAIR;

libmysql/net.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@
		#include <signal.h>
		#include <errno.h>
		#include <sys/types.h>
		#include <violite.h>

		#ifdef MYSQL_SERVER
		ulong max_allowed_packet=65536;