Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql (2fd65762) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+22 −12

Original line number	Diff line number	Diff line
		@@ -9490,7 +9490,8 @@ the sort order!
		@item The default return type of @code{IF} will now depend on both arguments
		and not only the first argument.
		@item @code{AUTO_INCREMENT} will not work with negative numbers.
		@item @code{INNER} and @code{DELAYED} are now reserved words.
		@item @code{INNER}, @code{DELAYED}, @code{RIGHT} and @code{WHEN}
		are now reserved words.
		@item @code{FLOAT(X)} is now a true floating point type and not a value with
		a fixed number of decimals.
		@item When declaring @code{DECIMAL(length,dec)} the length argument no
		@@ -18137,7 +18138,7 @@ the table will not be analyzed again.
		@section @code{REPAIR TABLE} syntax

		@example
		REPAIR TABLE tbl_name[,tbl_name...] [QUICK]
		REPAIR TABLE tbl_name[,tbl_name...] [QUICK] [EXTENDED]
		@end example

		@code{REPAIR TABLE} only works on @code{MyISAM} tables and is the same things
		@@ -18164,6 +18165,11 @@ future, we will make it more flexible.
		If @code{QUICK} is given then @strong{MySQL} will try to do a
		@code{REPAIR} of only the index tree.

		If you use @code{EXTENDED} then @strong{MySQL} will create the index row
		by row instead of creating one index at a time with sorting; This may be
		better than sorting on fixed length keys if you have long @code{char()}
		keys that compress very good.

		@findex DELETE
		@node DELETE, SELECT, REPAIR TABLE, Reference
		@section @code{DELETE} syntax
		@@ -20010,8 +20016,9 @@ Maximum number of temporary tables a client can keep open at the same time.
		After this many write locks, allow some read locks to run in between.

		@item @code{myisam_sort_buffer_size}
		The buffer that is allocated when sorting the index when doing a @code{REPAIR}
		table.
		The buffer that is allocated when sorting the index when doing a
		@code{REPAIR} or when creating indexes with @code{CREATE INDEX} or
		@code{ALTER TABLE}.

		@item @code{net_buffer_length}
		The communication buffer is reset to this size between queries. This
		@@ -31001,8 +31008,9 @@ in these cases, and can provide useful information about the current number
		of connections and their status.

		@item
		Run the command @code{mysqladmin -i 5 status}
		in a separate window to produce statistics while you run your other queries.
		Run the command @code{mysqladmin -i 5 status} or @code{mysqladmin -i 5
		-r status} or in a separate window to produce statistics while you run
		your other queries.

		@item
		Try the following:
		@@ -33602,7 +33610,9 @@ For the connection specified by @code{mysql}, @code{mysql_errno()} returns
		the error code for the most recently invoked API function that can succeed
		or fail. A return value of zero means that no error occurred. Client error
		message numbers are listed in the @strong{MySQL} @file{errmsg.h} header file.
		Server error message numbers are listed in @file{mysqld_error.h}
		Server error message numbers are listed in @file{mysqld_error.h}. In the
		@strong{MySQL} source distribution you can find a complete list of
		error messages and error numbers in the file @file{Docs/mysqld_error.txt}.

		@subsubheading Return values:

		@@ -38202,7 +38212,8 @@ was part of the key that was used to find rows.
		@item
		Fixed bug in @code{FULLTEXT} index when inserting a @code{NULL} column.
		@item
		Changed to use @code{mkstemp()} instead of @code{tempnam()}.
		Changed to use @code{mkstemp()} instead of @code{tempnam()}. Based
		on a patch from John Jones.
		@end itemize

		@node News-3.23.25, News-3.23.24, News-3.23.26, News-3.23.x
		@@ -42513,7 +42524,7 @@ tell us what you want to have done more quickly. @xref{Licensing and Support}.
		@item
		Fail safe replication.
		@item
		Optimize, test and document transactions safe tables
		Optimize, test and document transactions safe tables (BDB tables)
		@item
		Allow users to change startup options.
		@item
		@@ -42546,9 +42557,8 @@ Check if locked threads take any CPU.
		Fix configure so that one can compile all libraries (like @code{MyISAM})
		without threads.
		@item
		Change to use mkstemp() instead of tempnam() for system that supports the call.
		We need to add a my_mkstemp() function in mysys and also change the cache
		code to not create the filename until we do the actual open.
		Add an option to periodically flush key pages for tables with delayed keys
		if they haven't been used in a while.
		@item
		Allow join on key parts (optimization issue).
		@item

client/sql_string.cc

+19 −12

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ bool String::realloc(uint32 alloc_length)
		}
		else if ((new_ptr= (char*) my_malloc(len,MYF(MY_WME))))
		{
		if (str_length) // Avoid bugs in memcpy on AIX
		memcpy(new_ptr,Ptr,str_length);
		new_ptr[str_length]=0;
		Ptr=new_ptr;
		@@ -221,7 +222,7 @@ bool String::copy(const char *str,uint32 arg_length)
		{
		if (alloc(arg_length))
		return TRUE;
		str_length=arg_length;
		if ((str_length=arg_length))
		memcpy(Ptr,str,arg_length);
		Ptr[arg_length]=0;
		return FALSE;
		@@ -250,18 +251,22 @@ void String::strip_sp()
		}

		bool String::append(const String &s)
		{
		if (s.length())
		{
		if (realloc(str_length+s.length()))
		return TRUE;
		memcpy(Ptr+str_length,s.ptr(),s.length());
		str_length+=s.length();
		}
		return FALSE;
		}

		bool String::append(const char *s,uint32 arg_length)
		{
		if (!arg_length) // Default argument
		arg_length= (uint32) strlen(s);
		if (!(arg_length= (uint32) strlen(s)))
		return FALSE;
		if (realloc(str_length+arg_length))
		return TRUE;
		memcpy(Ptr+str_length,s,arg_length);
		@@ -398,6 +403,7 @@ bool String::replace(uint32 offset,uint32 arg_length,const String &to)
		{
		if (diff < 0)
		{
		if (to.length())
		memcpy(Ptr+offset,to.ptr(),to.length());
		bmove(Ptr+offset+to.length(),Ptr+offset+arg_length,
		str_length-offset-arg_length);
		@@ -411,6 +417,7 @@ bool String::replace(uint32 offset,uint32 arg_length,const String &to)
		bmove_upp(Ptr+str_length+diff,Ptr+str_length,
		str_length-offset-arg_length);
		}
		if (to.length())
		memcpy(Ptr+offset,to.ptr(),to.length());
		}
		str_length+=(uint32) diff;
		@@ -502,7 +509,7 @@ String copy_if_not_alloced(String to,String *from,uint32 from_length)
		}
		if (to->realloc(from_length))
		return from; // Actually an error
		to->str_length=min(from->str_length,from_length);
		if ((to->str_length=min(from->str_length,from_length)))
		memcpy(to->Ptr,from->Ptr,to->str_length);
		return to;
		}

mit-pthreads/Changes-mysql

+4 −0

Original line number	Diff line number	Diff line
		@@ -192,3 +192,7 @@ Changes done to this distrubtion (pthreads-1_60_beta6) by Monty (monty@tcx.se)

		00.03.30 by Monty (monty@mysql.com)
		- Added chroot() and gethostname().

		00.10.18 by Monty (monty@mysql.com)
		- Added patch by Dave Huang <khym@bga.com> to fix problem with date/time
		on NETBSD/Alpha.

mit-pthreads/config/configure

+4 −4

Original line number	Diff line number	Diff line
		@@ -1252,7 +1252,7 @@ except=""
		name=$host_cpu-$host_os

		case $host in
		alpha--netbsd1.3[H-Z]\|alpha--netbsd1.4*)
		alpha--netbsd1.3[H-Z]\|alpha--netbsd1.[45]*)
		name=alpha-netbsd-1.3
		sysincludes=netbsd-1.1
		except="fork lseek pipe fstat"
		@@ -1276,7 +1276,7 @@ case $host in
		CFLAGS="$CFLAGS -std"
		fi
		;;
		arm32--netbsd1.3[H-Z]\|arm32--netbsd1.4*)
		arm32--netbsd1.3[H-Z]\|arm32--netbsd1.[45]*)
		name=arm32-netbsd-1.3
		sysincludes=netbsd-1.1
		except="fork pipe lseek ftruncate fstat"
		@@ -1336,7 +1336,7 @@ EOF
		EOF

		;;
		sparc--netbsd1.3[H-Z]\|sparc--netbsd1.4*)
		sparc--netbsd1.3[H-Z]\|sparc--netbsd1.[45]*)
		name=sparc-netbsd-1.3
		sysincludes=netbsd-1.1
		except="pipe fork lseek ftruncate fstat"
		@@ -1375,7 +1375,7 @@ EOF
		syscall=i386-bsdi-2.0
		except="fork lseek ftruncate sigsuspend"
		;;
		i386--netbsd1.3[H-Z]\|i386--netbsd1.4*)
		i386--netbsd1.3[H-Z]\|i386--netbsd1.[45]*)
		name=i386-netbsd-1.3
		sysincludes=netbsd-1.1
		except="fork lseek ftruncate pipe fstat"

mit-pthreads/config/configure.in

+4 −4

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ name=$host_cpu-$host_os

		case $host in
		changequote(,)dnl
		alpha--netbsd1.3[H-Z]\|alpha--netbsd1.4*)
		alpha--netbsd1.3[H-Z]\|alpha--netbsd1.[45]*)
		name=alpha-netbsd-1.3
		sysincludes=netbsd-1.1
		except="fork lseek pipe fstat"
		@@ -152,7 +152,7 @@ changequote([,])dnl
		fi
		;;
		changequote(,)dnl
		arm32--netbsd1.3[H-Z]\|arm32--netbsd1.4*)
		arm32--netbsd1.3[H-Z]\|arm32--netbsd1.[45]*)
		name=arm32-netbsd-1.3
		sysincludes=netbsd-1.1
		except="fork pipe lseek ftruncate fstat"
		@@ -199,7 +199,7 @@ changequote([,])dnl
		AC_DEFINE(BROKEN_SIGNALS)
		;;
		changequote(,)dnl
		sparc--netbsd1.3[H-Z]\|sparc--netbsd1.4*)
		sparc--netbsd1.3[H-Z]\|sparc--netbsd1.[45]*)
		name=sparc-netbsd-1.3
		sysincludes=netbsd-1.1
		except="pipe fork lseek ftruncate fstat"
		@@ -240,7 +240,7 @@ changequote([,])dnl
		except="fork lseek ftruncate sigsuspend"
		;;
		changequote(,)dnl
		i386--netbsd1.3[H-Z]\|i386--netbsd1.4*)
		i386--netbsd1.3[H-Z]\|i386--netbsd1.[45]*)
		name=i386-netbsd-1.3
		sysincludes=netbsd-1.1
		except="fork lseek ftruncate pipe fstat"