Commit 3de11a9a authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 0ac5d095 3c5f7494
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ diff -r -c --exclude=*.info* glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nssw
        while (isspace (line[0]))
  	++line;
***************
*** 510,522 ****
522
        if (name == line)
  	return result;
  
@@ -86,7 +86,7 @@ diff -r -c --exclude=*.info* glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nssw
        if (new_service == NULL)
  	return result;
  
!       *((char *) __mempcpy (new_service->name, name, name_alloc_len)) = '\0';
!       *((char *) __mempcpy (new_service->name, name, name_alloc_len-1)) = '\0';
  
        /* Set default actions.  */
        new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
+10 −0
Original line number Diff line number Diff line
@@ -26723,6 +26723,12 @@ In the first statement, the @code{LIKE} value begins with a wildcard
character.  In the second statement, the @code{LIKE} value is not a
constant.
MySQL 4.0 does another optimization on @code{LIKE}.  If you are using
@code{... LIKE "%string%"} and @code{string} is longer than 3 characters
then MySQL will use the turbo-boyer-more algorithm to once initialize
the pattern for the string and then use this pattern to quickly search
after the given string.
@findex IS NULL, and indexes
@cindex indexes, and @code{IS NULL}
Searching using @code{column_name IS NULL} will use indexes if column_name
@@ -49305,6 +49311,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@item
Use turbo-boyer-more to speed up @code{LIKE "%keyword%"} searches.
@item
Fixed bug in @code{DROP DATABASE} with symlink.
@item
Fixed crash in @code{REPAIR ... USE_FRM}.
@@ -49789,6 +49797,8 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.51
@itemize @bullet
@item
Fixed bug in @code{CONCAT_WS()} that cut the result.
@item
Changed name of variables @code{Com_show_master_stat} to
@code{Com_show_master_status} and @code{Com_show_slave_stat} to
@code{Com_show_slave_status}.
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE README \
SUBDIRS =		include @docs_dirs@ @readline_dir@ \
			@thread_dirs@ pstack @sql_client_dirs@ \
			@sql_server_dirs@ @libmysqld_dirs@ scripts man \
			tests BUILD \
			tests BUILD os2 \
			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@

# Relink after clean
+1 −1
Original line number Diff line number Diff line
@@ -2364,7 +2364,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
 myisam/Makefile myisammrg/Makefile \
 man/Makefile BUILD/Makefile readline/Makefile vio/Makefile \
 libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \
 libmysql/Makefile client/Makefile \
 libmysql/Makefile client/Makefile os2/Makefile \
 pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile \
 merge/Makefile dbug/Makefile scripts/Makefile \
 include/Makefile sql-bench/Makefile tools/Makefile \
+13 −0
Original line number Diff line number Diff line
number	alpha	new
1413006	idlfmv	1413006<---->idlfmv
1413065	smpsfz	1413065<---->smpsfz
1413127	sljrhx	1413127<---->sljrhx
1413304	qerfnd	1413304<---->qerfnd
new
1413006<---->idlfmv
number	alpha	new
1413006	idlfmv	1413006<->idlfmv
number	alpha	new
1413006	idlfmv	1413006-idlfmv-idlfmv-idlfmv-idlfmv-idlfmv-idlfmv-idlfmv
number	alpha	new
1413006	idlfmv	1413006<------------------>idlfmv
Loading