Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 (e0f60f35) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,3 +64,4 @@ venu@work.mysql.com
		worm@altair.is.lan
		zak@balfor.local
		zak@linux.local
		tfr@indrek.tfr.cafe.ee

Docs/ManualStyleGuidelines.wiki

+5 −2

Original line number	Diff line number	Diff line
		@@ -2,11 +2,12 @@ OriginalAuthor: PaulDuBois

		!!! ManualStyleGuidelines

		''Version 1.0''
		''Version 1.1''

		!! Revision History

		* 2002-05-17 ArjenLentz - Version 1.0, Posted to Wiki
		* 2002-06-03 ArjenLentz - Version 1.1, updates.

		!! MySQL Manual Style Guidelines

		@@ -277,3 +278,5 @@ Logical NOT/OR/AND are operators, not functions, so they take operands, not argu

		It's NetWare, not Netware (as per Novell's trademark guidelines).

		It's deprecated, not depricated.

Docs/manual.texi

+10 −4

Original line number	Diff line number	Diff line
		@@ -14341,7 +14341,7 @@ privilege.

		@item --skip-stack-trace
		Don't write stack traces. This option is useful when you are running
		@code{mysqld} under a debugger. On some system you also have to use
		@code{mysqld} under a debugger. On some systems you also have to use
		this option to get a core file. @xref{Debugging server}.

		@item --skip-thread-priority
		@@ -22662,9 +22662,12 @@ Overrides option --databases (-B).
		@item -T, --tab=path-to-some-directory
		Creates a @code{table_name.sql} file, that contains the SQL CREATE commands,
		and a @code{table_name.txt} file, that contains the data, for each give table.
		@strong{Note}: This only works if @code{mysqldump} is run on the same
		machine as the @code{mysqld} daemon. The format of the @file{.txt} file
		is made according to the @code{--fields-xxx} and @code{--lines--xxx} options.
		The format of the @file{.txt} file is made according to the
		@code{--fields-xxx} and @code{--lines--xxx} options.
		@strong{Note}: This option only works if @code{mysqldump} is run on the same
		machine as the @code{mysqld} daemon, and the user/group that @code{mysqld}
		is running as (normally user @code{mysql}, group @code{mysql}) needs to have
		permission to create/write a file at the location you specify.
		@item -u user_name, --user=user_name
		The MySQL user name to use when connecting to the server. The
		default value is your Unix login name.
		@@ -49340,6 +49343,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.

		@itemize @bullet
		@item
		Fixed that @code{ALTER TABLE table_name RENAME new_table_name} is as fast
		as @code{RENAME TABLE}.
		@item
		Fixed bug in @code{GROUP BY} with two or more fields, where at least one
		field can contain @code{NULL} values.
		@item

Docs/mirrors.texi

+0 −9

Original line number	Diff line number	Diff line
		@@ -71,10 +71,6 @@ FTP (@uref{ftp://mir1.ovh.net/ftp.mysql.com/})
		@image{Flags/france} France [Netsample] @@
		WWW (@uref{http://www.mysql.netsample.com/})

		@item
		@image{Flags/france} France [Omegatomic] @@
		WWW (@uref{http://mysql.omegatomic.com/})

		@item
		@image{Flags/france} France [Universite Paris 10] @@
		WWW (@uref{http://ftp.u-paris10.fr/mysql.com})
		@@ -269,10 +265,6 @@ FTP (@uref{ftp://mysql.unam.mx/pub/mysql/})
		@image{Flags/usa} USA [adgrafix.com / Boston, MA] @@
		WWW (@uref{http://mysql.adgrafix.com/})

		@item
		@image{Flags/usa} USA [Fast Mirror / Englewood, CO] @@
		WWW (@uref{http://mysql.fastmirror.com/})

		@item
		@image{Flags/usa} USA [Hurricane Electric / San Jose, CA] @@
		WWW (@uref{http://mysql.he.net/})
		@@ -432,4 +424,3 @@ FTP (@uref{ftp://ftp.is.co.za/linux/mysql/})

		@end itemize

client/mysqltest.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@

		**********************************************************************/

		#define MTEST_VERSION "1.23"
		#define MTEST_VERSION "1.24"

		#include <my_global.h>
		#include <mysql_embed.h>
		@@ -1446,6 +1446,8 @@ int do_connect(struct st_query* q)
		die("Failed on mysql_init()");
		if (opt_compress)
		mysql_options(&next_con->mysql,MYSQL_OPT_COMPRESS,NullS);
		mysql_options(&next_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);

		if (con_sock && !free_con_sock && con_sock && con_sock != FN_LIBCHAR)
		con_sock=fn_format(buff, con_sock, TMPDIR, "",0);
		if (!con_db[0])
		@@ -2355,6 +2357,8 @@ int main(int argc, char** argv)
		die("Failed in mysql_init()");
		if (opt_compress)
		mysql_options(&cur_con->mysql,MYSQL_OPT_COMPRESS,NullS);
		mysql_options(&cur_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);

		cur_con->name = my_strdup("default", MYF(MY_WME));
		if (!cur_con->name)
		die("Out of memory");