Loading BitKeeper/etc/logging_ok +2 −2 Original line number Diff line number Diff line Loading @@ -6,6 +6,7 @@ Sinisa@sinisa.nasamreza.org ahlentz@co3064164-a.rochd1.qld.optusnet.com.au arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi Loading @@ -20,6 +21,7 @@ jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com jorge@linux.jorge.mysql.com kaj@work.mysql.com lenz@kallisto.mysql.com miguel@hegel.local miguel@light.local monty@bitch.mysql.fi Loading Loading @@ -51,5 +53,3 @@ tonu@x3.internalnet venu@work.mysql.com zak@balfor.local zak@linux.local arjen@george.bitbike.com lenz@kallisto.mysql.com Docs/glibc-2.2.5.patch +183 −73 Original line number Diff line number Diff line diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/internals.h ./linuxthreads/internals.h --- ../glibc-2.2.5/linuxthreads/internals.h Thu Nov 29 00:44:16 2001 +++ ./linuxthreads/internals.h Fri Feb 22 21:18:09 2002 @@ -343,7 +343,7 @@ Only in glibc-2.2.4-new: bits Only in glibc-2.2.4-new: config.cache Only in glibc-2.2.4-new: config.h Only in glibc-2.2.4-new: config.log Only in glibc-2.2.4-new: config.make Only in glibc-2.2.4-new: config.status Only in glibc-2.2.4-new: glibcbug Only in glibc-2.2.4-new/iconv: strtab.o diff -r -c glibc-2.2.4/linuxthreads/internals.h glibc-2.2.4-new/linuxthreads/internals.h *** glibc-2.2.4/linuxthreads/internals.h Mon Jul 23 20:54:13 2001 --- glibc-2.2.4-new/linuxthreads/internals.h Tue Apr 16 15:08:03 2002 *************** *** 339,345 **** THREAD_SELF implementation is used, this must be a power of two and a multiple of PAGE_SIZE. */ #ifndef STACK_SIZE -#define STACK_SIZE (2 * 1024 * 1024) +#define STACK_SIZE (128 * 1024) ! #define STACK_SIZE (2 * 1024 * 1024) #endif /* The initial size of the thread stack. Must be a multiple of PAGE_SIZE. */ diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h --- ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Thu Jun 8 13:49:49 2000 +++ ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Fri Feb 22 21:18:09 2002 @@ -64,7 +64,7 @@ --- 339,345 ---- THREAD_SELF implementation is used, this must be a power of two and a multiple of PAGE_SIZE. */ #ifndef STACK_SIZE ! #define STACK_SIZE (128 * 1024) #endif /* The initial size of the thread stack. Must be a multiple of PAGE_SIZE. */ Only in glibc-2.2.4-new/linuxthreads: internals.h.rej diff -r -c glibc-2.2.4/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h glibc-2.2.4-new/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h *** glibc-2.2.4/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Fri Jun 9 22:17:35 2000 --- glibc-2.2.4-new/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Tue Apr 16 15:10:38 2002 *************** *** 64,70 **** /* The number of threads per process. */ #define _POSIX_THREAD_THREADS_MAX 64 /* This is the value this implementation supports. */ -#define PTHREAD_THREADS_MAX 1024 +#define PTHREAD_THREADS_MAX 4096 ! #define PTHREAD_THREADS_MAX 1024 /* Maximum amount by which a process can descrease its asynchronous I/O priority level. */ diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/nss/nsswitch.c ./nss/nsswitch.c --- ../glibc-2.2.5/nss/nsswitch.c Tue Jul 17 02:21:36 2001 +++ ./nss/nsswitch.c Fri Feb 22 21:18:09 2002 @@ -515,8 +515,16 @@ + (line - name + 1)); if (new_service == NULL) --- 64,70 ---- /* The number of threads per process. */ #define _POSIX_THREAD_THREADS_MAX 64 /* This is the value this implementation supports. */ ! #define PTHREAD_THREADS_MAX 4096 /* Maximum amount by which a process can descrease its asynchronous I/O priority level. */ Only in glibc-2.2.4-new/linuxthreads/sysdeps/unix/sysv/linux/bits: local_lim.h.rej Only in glibc-2.2.4-new/manual: chapters.texi Only in glibc-2.2.4/manual: dir-add.info Only in glibc-2.2.4/manual: libc.info Only in glibc-2.2.4/manual: libc.info-1 Only in glibc-2.2.4/manual: libc.info-10 Only in glibc-2.2.4/manual: libc.info-11 Only in glibc-2.2.4/manual: libc.info-12 Only in glibc-2.2.4/manual: libc.info-13 Only in glibc-2.2.4/manual: libc.info-14 Only in glibc-2.2.4/manual: libc.info-15 Only in glibc-2.2.4/manual: libc.info-16 Only in glibc-2.2.4/manual: libc.info-17 Only in glibc-2.2.4/manual: libc.info-18 Only in glibc-2.2.4/manual: libc.info-19 Only in glibc-2.2.4/manual: libc.info-2 Only in glibc-2.2.4/manual: libc.info-20 Only in glibc-2.2.4/manual: libc.info-21 Only in glibc-2.2.4/manual: libc.info-22 Only in glibc-2.2.4/manual: libc.info-23 Only in glibc-2.2.4/manual: libc.info-24 Only in glibc-2.2.4/manual: libc.info-25 Only in glibc-2.2.4/manual: libc.info-26 Only in glibc-2.2.4/manual: libc.info-27 Only in glibc-2.2.4/manual: libc.info-28 Only in glibc-2.2.4/manual: libc.info-29 Only in glibc-2.2.4/manual: libc.info-3 Only in glibc-2.2.4/manual: libc.info-30 Only in glibc-2.2.4/manual: libc.info-31 Only in glibc-2.2.4/manual: libc.info-32 Only in glibc-2.2.4/manual: libc.info-33 Only in glibc-2.2.4/manual: libc.info-34 Only in glibc-2.2.4/manual: libc.info-35 Only in glibc-2.2.4/manual: libc.info-36 Only in glibc-2.2.4/manual: libc.info-37 Only in glibc-2.2.4/manual: libc.info-38 Only in glibc-2.2.4/manual: libc.info-39 Only in glibc-2.2.4/manual: libc.info-4 Only in glibc-2.2.4/manual: libc.info-40 Only in glibc-2.2.4/manual: libc.info-41 Only in glibc-2.2.4/manual: libc.info-42 Only in glibc-2.2.4/manual: libc.info-43 Only in glibc-2.2.4/manual: libc.info-44 Only in glibc-2.2.4/manual: libc.info-45 Only in glibc-2.2.4/manual: libc.info-46 Only in glibc-2.2.4/manual: libc.info-47 Only in glibc-2.2.4/manual: libc.info-48 Only in glibc-2.2.4/manual: libc.info-49 Only in glibc-2.2.4/manual: libc.info-5 Only in glibc-2.2.4/manual: libc.info-50 Only in glibc-2.2.4/manual: libc.info-51 Only in glibc-2.2.4/manual: libc.info-52 Only in glibc-2.2.4/manual: libc.info-53 Only in glibc-2.2.4/manual: libc.info-54 Only in glibc-2.2.4/manual: libc.info-55 Only in glibc-2.2.4/manual: libc.info-56 Only in glibc-2.2.4/manual: libc.info-57 Only in glibc-2.2.4/manual: libc.info-58 Only in glibc-2.2.4/manual: libc.info-59 Only in glibc-2.2.4/manual: libc.info-6 Only in glibc-2.2.4/manual: libc.info-60 Only in glibc-2.2.4/manual: libc.info-7 Only in glibc-2.2.4/manual: libc.info-8 Only in glibc-2.2.4/manual: libc.info-9 Only in glibc-2.2.4-new/manual: stamp-summary Only in glibc-2.2.4-new/manual: summary.texi Only in glibc-2.2.4-new/manual: texis Only in glibc-2.2.4-new/manual: top-menu.texi Only in glibc-2.2.4-new/nss: nsswitch-org.c diff -r -c glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nsswitch.c *** glibc-2.2.4/nss/nsswitch.c Mon Jul 23 20:54:48 2001 --- glibc-2.2.4-new/nss/nsswitch.c Tue Apr 16 15:43:32 2002 *************** *** 510,515 **** --- 510,523 ---- if (name == line) return result; - +#ifdef DO_STATIC_NSS + if (strncmp(name,"files",5) == 0 || + strncmp(name,"dns",3) == 0) +#endif *((char *) __mempcpy (new_service->name, name, line - name)) = '\0'; + #ifdef DO_STATIC_NSS + else + *((char *) __mempcpy (new_service->name, "files", 5)) = '\0'; + if (!(((line-name) == 5 && strncmp(name,"files",5) == 0) || + ((line-name) == 3 && strncmp(name,"dns",3) == 0))) + { + name = (char*) "files"; + line = (char*) name+5; + } + #endif + /* Set default actions. */ new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE; diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/time/Makefile ./time/Makefile --- ../glibc-2.2.5/time/Makefile Fri Feb 22 21:27:19 2002 +++ ./time/Makefile Fri Feb 22 21:26:47 2002 @@ -37,8 +37,8 @@ new_service = (service_user *) malloc (sizeof (service_user) + (line - name + 1)); Only in glibc-2.2.4-new: skr diff -r -c glibc-2.2.4/time/Makefile glibc-2.2.4-new/time/Makefile *** glibc-2.2.4/time/Makefile Fri Aug 10 22:12:07 2001 --- glibc-2.2.4-new/time/Makefile Tue Apr 16 15:11:09 2002 *************** *** 37,44 **** include ../Rules ! tz-cflags = -DTZDIR='"$(zonedir)"' \ ! -DTZDEFAULT='"$(localtime-file)"' \ -DTZDEFRULES='"$(posixrules-file)"' CFLAGS-tzfile.c = $(tz-cflags) --- 37,44 ---- include ../Rules -tz-cflags = -DTZDIR='"$(zonedir)"' \ - -DTZDEFAULT='"$(localtime-file)"' \ +tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ + -DTZDEFAULT='"/etc/localtime"' \ ! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ ! -DTZDEFAULT='"/etc/localtime"' \ -DTZDEFRULES='"$(posixrules-file)"' CFLAGS-tzfile.c = $(tz-cflags) diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/timezone/Makefile ./timezone/Makefile --- ../glibc-2.2.5/timezone/Makefile Wed Aug 29 16:45:25 2001 +++ ./timezone/Makefile Fri Feb 22 21:18:09 2002 @@ -159,8 +159,8 @@ diff -r -c glibc-2.2.4/timezone/Makefile glibc-2.2.4-new/timezone/Makefile *** glibc-2.2.4/timezone/Makefile Mon Jul 23 20:58:05 2001 --- glibc-2.2.4-new/timezone/Makefile Tue Apr 16 15:11:09 2002 *************** *** 159,166 **** $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o ! tz-cflags = -DTZDIR='"$(zonedir)"' \ ! -DTZDEFAULT='"$(localtime-file)"' \ -DTZDEFRULES='"$(posixrules-file)"' \ -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone --- 159,166 ---- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o -tz-cflags = -DTZDIR='"$(zonedir)"' \ - -DTZDEFAULT='"$(localtime-file)"' \ +tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ + -DTZDEFAULT='"/etc/localtime"' \ ! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ ! -DTZDEFAULT='"/etc/localtime"' \ -DTZDEFRULES='"$(posixrules-file)"' \ -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone Docs/manual.texi +54 −9 Original line number Diff line number Diff line Loading @@ -30373,6 +30373,9 @@ stored into a temporary table) is calculated in MySQL Version @item expr2 or expr3 returns an integer @tab integer @end multitable If expr2 and expr3 are strings, then the result is case sensitive if both strings are case sensitive. (Starting from 3.23.51) @findex CASE @item CASE value WHEN [compare-value] THEN result [WHEN [compare-value] THEN result ...] [ELSE result] END @item CASE WHEN [condition] THEN result [WHEN [condition] THEN result ...] [ELSE result] END Loading Loading @@ -35268,6 +35271,9 @@ Note that if you use any other option to @code{ALTER TABLE} than if the data wouldn't strictly need to be copied (like when you change the name of a column). We plan to fix this in the future, but as one doesn't normally do @code{ALTER TABLE} that often this isn't that high on our TODO. For MyISAM tables, you can speed up the index recreation part (which is the slowest part of the recreation process) by setting the @code{myisam_sort_buffer_size} variable to a high value. @itemize @bullet @item Loading Loading @@ -45806,9 +45812,6 @@ Another common reason to receive the @code{MySQL server has gone away} error is because you have issued a ``close'' on your MySQL connection and then tried to run a query on the closed connection. You can check that the MySQL hasn't died by executing @code{mysqladmin version} and examining the uptime. If you have a script, you just have to issue the query again for the client to do an automatic reconnection. Loading @@ -45823,6 +45826,15 @@ server. to the server, but it didn't get a full answer (or any answer) to the question. @end multitable You will also get this error if someone has kills the running thread with @code{kill #threadid#}. You can check that the MySQL hasn't died by executing @code{mysqladmin version} and examining the uptime. If the problem is that mysqld crashed you should concentrate one finding the reason for the crash. You should in this case start by checking if issuing the query again will kill MySQL again. @xref{Crashing}. You can also get these errors if you send a query to the server that is incorrect or too large. If @code{mysqld} gets a packet that is too large or out of order, it assumes that something has gone wrong with the client and Loading @@ -45833,6 +45845,26 @@ starting @code{mysqld} with the @code{-O max_allowed_packet=#} option use more memory only when you issue a big query or when @code{mysqld} must return a big result row! If you want to make a bug report regarding this problem, be sure that you include the following information: @itemize @bullet @item Include information if MySQL died or not. (You can find this in the @code{hostname.err file}. @xref{Crashing}. @item If a specific query kills @code{mysqld} and the involved tables where checked with @code{CHECK TABLE} before you did the query, can you do a test case for this? @xref{Reproduceable test case}. @item What is the value of the @code{wait_timeout} variable in the MySQL server ? @code{mysqladmin variables} gives you the value of this @item Have you tried to run @code{mysqld} with @code{--log} and check if the issued query appears in the log ? @end itemize @xref{Asking questions}. @node Can not connect to server, Blocked host, Gone away, Common errors @appendixsubsec @code{Can't connect to [local] MySQL server} Error Loading Loading @@ -49371,19 +49403,32 @@ not yet 100% confident in this code. @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 when used with big ( > 64K) strings. Fixed the result from @code{IF()} is case in-sensitive if the 2 and third arguments are case sensitive. @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 Fixed problem with @code{crash-me} and gcc 3.0.4. @item Fixed that @code{@@@@unknown_variable} doesn't hang server. @item Added @code{@@@@VERSION} as a synonym for @code{VERSION()}. @item @code{SHOW VARIABLES LIKE 'xxx'} is now case insensitive. @item Fixed timeout for @code{GET_LOCK()} on HPUX with DCE threads. @item Fixed memory allocation bug in the glibc library used to build Linux binaries, which caused mysqld to die in 'free()'. @item Fixed @code{SIGINT} and @code{SIGQUIT} problems in @code{mysql}. @item Fixed bug in character table converts when used with big ( > 64K) strings. @item @code{InnoDB} now retains foreign key constraints through @code{ALTER TABLE} and @code{CREATE/DROP INDEX}. @item client/mysql.cc +9 −14 Original line number Diff line number Diff line /* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000-2002 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Loading Loading @@ -354,18 +354,6 @@ int main(int argc,char *argv[]) mysql_thread_id(&mysql),mysql_get_server_info(&mysql)); put_info((char*) glob_buffer.ptr(),INFO_INFO); #ifdef HAVE_OPENSSL if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) { sprintf((char*) glob_buffer.ptr(), "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); put_info((char*) glob_buffer.ptr(),INFO_INFO); } else put_info("SSL is not in use\n",INFO_INFO); #endif /* HAVE_OPENSSL */ #ifdef HAVE_READLINE initialize_readline(my_progname); if (!status.batch && !quick && !opt_html && !opt_xml) Loading Loading @@ -697,7 +685,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case 'p': if (argument == disabled_my_option) opt_password= ""; opt_password= (char*) ""; else { if (argument) Loading Loading @@ -2329,6 +2317,13 @@ com_status(String *buffer __attribute__((unused)), tee_fprintf(stdout, "Current user:\t\t%s\n",cur[1]); (void) mysql_fetch_row(result); // Read eof } #ifdef HAVE_OPENSSL if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) tee_fprintf(stdout, "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); else #endif /* HAVE_OPENSSL */ tee_puts("SSL is not in use\n", stdout); } else { Loading configure.in +6 −6 Original line number Diff line number Diff line Loading @@ -882,9 +882,9 @@ case $SYSTEM_TYPE in CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS"; ;; *hpux10.20*) echo "Enabling snprintf workaround for hpux 10.20" CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE" echo "Enabling workarounds for hpux 10.20" CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" if test "$with_named_thread" = "no" then echo "Using --with-named-thread=-lpthread" Loading @@ -892,9 +892,9 @@ case $SYSTEM_TYPE in fi ;; *hpux11.*) echo "Enabling pread/pwrite workaround for hpux 11" CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS" echo "Enabling workarounds for hpux 11" CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" if test "$with_named_thread" = "no" then echo "Using --with-named-thread=-lpthread" Loading Loading
BitKeeper/etc/logging_ok +2 −2 Original line number Diff line number Diff line Loading @@ -6,6 +6,7 @@ Sinisa@sinisa.nasamreza.org ahlentz@co3064164-a.rochd1.qld.optusnet.com.au arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi Loading @@ -20,6 +21,7 @@ jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com jorge@linux.jorge.mysql.com kaj@work.mysql.com lenz@kallisto.mysql.com miguel@hegel.local miguel@light.local monty@bitch.mysql.fi Loading Loading @@ -51,5 +53,3 @@ tonu@x3.internalnet venu@work.mysql.com zak@balfor.local zak@linux.local arjen@george.bitbike.com lenz@kallisto.mysql.com
Docs/glibc-2.2.5.patch +183 −73 Original line number Diff line number Diff line diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/internals.h ./linuxthreads/internals.h --- ../glibc-2.2.5/linuxthreads/internals.h Thu Nov 29 00:44:16 2001 +++ ./linuxthreads/internals.h Fri Feb 22 21:18:09 2002 @@ -343,7 +343,7 @@ Only in glibc-2.2.4-new: bits Only in glibc-2.2.4-new: config.cache Only in glibc-2.2.4-new: config.h Only in glibc-2.2.4-new: config.log Only in glibc-2.2.4-new: config.make Only in glibc-2.2.4-new: config.status Only in glibc-2.2.4-new: glibcbug Only in glibc-2.2.4-new/iconv: strtab.o diff -r -c glibc-2.2.4/linuxthreads/internals.h glibc-2.2.4-new/linuxthreads/internals.h *** glibc-2.2.4/linuxthreads/internals.h Mon Jul 23 20:54:13 2001 --- glibc-2.2.4-new/linuxthreads/internals.h Tue Apr 16 15:08:03 2002 *************** *** 339,345 **** THREAD_SELF implementation is used, this must be a power of two and a multiple of PAGE_SIZE. */ #ifndef STACK_SIZE -#define STACK_SIZE (2 * 1024 * 1024) +#define STACK_SIZE (128 * 1024) ! #define STACK_SIZE (2 * 1024 * 1024) #endif /* The initial size of the thread stack. Must be a multiple of PAGE_SIZE. */ diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h --- ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Thu Jun 8 13:49:49 2000 +++ ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Fri Feb 22 21:18:09 2002 @@ -64,7 +64,7 @@ --- 339,345 ---- THREAD_SELF implementation is used, this must be a power of two and a multiple of PAGE_SIZE. */ #ifndef STACK_SIZE ! #define STACK_SIZE (128 * 1024) #endif /* The initial size of the thread stack. Must be a multiple of PAGE_SIZE. */ Only in glibc-2.2.4-new/linuxthreads: internals.h.rej diff -r -c glibc-2.2.4/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h glibc-2.2.4-new/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h *** glibc-2.2.4/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Fri Jun 9 22:17:35 2000 --- glibc-2.2.4-new/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Tue Apr 16 15:10:38 2002 *************** *** 64,70 **** /* The number of threads per process. */ #define _POSIX_THREAD_THREADS_MAX 64 /* This is the value this implementation supports. */ -#define PTHREAD_THREADS_MAX 1024 +#define PTHREAD_THREADS_MAX 4096 ! #define PTHREAD_THREADS_MAX 1024 /* Maximum amount by which a process can descrease its asynchronous I/O priority level. */ diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/nss/nsswitch.c ./nss/nsswitch.c --- ../glibc-2.2.5/nss/nsswitch.c Tue Jul 17 02:21:36 2001 +++ ./nss/nsswitch.c Fri Feb 22 21:18:09 2002 @@ -515,8 +515,16 @@ + (line - name + 1)); if (new_service == NULL) --- 64,70 ---- /* The number of threads per process. */ #define _POSIX_THREAD_THREADS_MAX 64 /* This is the value this implementation supports. */ ! #define PTHREAD_THREADS_MAX 4096 /* Maximum amount by which a process can descrease its asynchronous I/O priority level. */ Only in glibc-2.2.4-new/linuxthreads/sysdeps/unix/sysv/linux/bits: local_lim.h.rej Only in glibc-2.2.4-new/manual: chapters.texi Only in glibc-2.2.4/manual: dir-add.info Only in glibc-2.2.4/manual: libc.info Only in glibc-2.2.4/manual: libc.info-1 Only in glibc-2.2.4/manual: libc.info-10 Only in glibc-2.2.4/manual: libc.info-11 Only in glibc-2.2.4/manual: libc.info-12 Only in glibc-2.2.4/manual: libc.info-13 Only in glibc-2.2.4/manual: libc.info-14 Only in glibc-2.2.4/manual: libc.info-15 Only in glibc-2.2.4/manual: libc.info-16 Only in glibc-2.2.4/manual: libc.info-17 Only in glibc-2.2.4/manual: libc.info-18 Only in glibc-2.2.4/manual: libc.info-19 Only in glibc-2.2.4/manual: libc.info-2 Only in glibc-2.2.4/manual: libc.info-20 Only in glibc-2.2.4/manual: libc.info-21 Only in glibc-2.2.4/manual: libc.info-22 Only in glibc-2.2.4/manual: libc.info-23 Only in glibc-2.2.4/manual: libc.info-24 Only in glibc-2.2.4/manual: libc.info-25 Only in glibc-2.2.4/manual: libc.info-26 Only in glibc-2.2.4/manual: libc.info-27 Only in glibc-2.2.4/manual: libc.info-28 Only in glibc-2.2.4/manual: libc.info-29 Only in glibc-2.2.4/manual: libc.info-3 Only in glibc-2.2.4/manual: libc.info-30 Only in glibc-2.2.4/manual: libc.info-31 Only in glibc-2.2.4/manual: libc.info-32 Only in glibc-2.2.4/manual: libc.info-33 Only in glibc-2.2.4/manual: libc.info-34 Only in glibc-2.2.4/manual: libc.info-35 Only in glibc-2.2.4/manual: libc.info-36 Only in glibc-2.2.4/manual: libc.info-37 Only in glibc-2.2.4/manual: libc.info-38 Only in glibc-2.2.4/manual: libc.info-39 Only in glibc-2.2.4/manual: libc.info-4 Only in glibc-2.2.4/manual: libc.info-40 Only in glibc-2.2.4/manual: libc.info-41 Only in glibc-2.2.4/manual: libc.info-42 Only in glibc-2.2.4/manual: libc.info-43 Only in glibc-2.2.4/manual: libc.info-44 Only in glibc-2.2.4/manual: libc.info-45 Only in glibc-2.2.4/manual: libc.info-46 Only in glibc-2.2.4/manual: libc.info-47 Only in glibc-2.2.4/manual: libc.info-48 Only in glibc-2.2.4/manual: libc.info-49 Only in glibc-2.2.4/manual: libc.info-5 Only in glibc-2.2.4/manual: libc.info-50 Only in glibc-2.2.4/manual: libc.info-51 Only in glibc-2.2.4/manual: libc.info-52 Only in glibc-2.2.4/manual: libc.info-53 Only in glibc-2.2.4/manual: libc.info-54 Only in glibc-2.2.4/manual: libc.info-55 Only in glibc-2.2.4/manual: libc.info-56 Only in glibc-2.2.4/manual: libc.info-57 Only in glibc-2.2.4/manual: libc.info-58 Only in glibc-2.2.4/manual: libc.info-59 Only in glibc-2.2.4/manual: libc.info-6 Only in glibc-2.2.4/manual: libc.info-60 Only in glibc-2.2.4/manual: libc.info-7 Only in glibc-2.2.4/manual: libc.info-8 Only in glibc-2.2.4/manual: libc.info-9 Only in glibc-2.2.4-new/manual: stamp-summary Only in glibc-2.2.4-new/manual: summary.texi Only in glibc-2.2.4-new/manual: texis Only in glibc-2.2.4-new/manual: top-menu.texi Only in glibc-2.2.4-new/nss: nsswitch-org.c diff -r -c glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nsswitch.c *** glibc-2.2.4/nss/nsswitch.c Mon Jul 23 20:54:48 2001 --- glibc-2.2.4-new/nss/nsswitch.c Tue Apr 16 15:43:32 2002 *************** *** 510,515 **** --- 510,523 ---- if (name == line) return result; - +#ifdef DO_STATIC_NSS + if (strncmp(name,"files",5) == 0 || + strncmp(name,"dns",3) == 0) +#endif *((char *) __mempcpy (new_service->name, name, line - name)) = '\0'; + #ifdef DO_STATIC_NSS + else + *((char *) __mempcpy (new_service->name, "files", 5)) = '\0'; + if (!(((line-name) == 5 && strncmp(name,"files",5) == 0) || + ((line-name) == 3 && strncmp(name,"dns",3) == 0))) + { + name = (char*) "files"; + line = (char*) name+5; + } + #endif + /* Set default actions. */ new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE; diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/time/Makefile ./time/Makefile --- ../glibc-2.2.5/time/Makefile Fri Feb 22 21:27:19 2002 +++ ./time/Makefile Fri Feb 22 21:26:47 2002 @@ -37,8 +37,8 @@ new_service = (service_user *) malloc (sizeof (service_user) + (line - name + 1)); Only in glibc-2.2.4-new: skr diff -r -c glibc-2.2.4/time/Makefile glibc-2.2.4-new/time/Makefile *** glibc-2.2.4/time/Makefile Fri Aug 10 22:12:07 2001 --- glibc-2.2.4-new/time/Makefile Tue Apr 16 15:11:09 2002 *************** *** 37,44 **** include ../Rules ! tz-cflags = -DTZDIR='"$(zonedir)"' \ ! -DTZDEFAULT='"$(localtime-file)"' \ -DTZDEFRULES='"$(posixrules-file)"' CFLAGS-tzfile.c = $(tz-cflags) --- 37,44 ---- include ../Rules -tz-cflags = -DTZDIR='"$(zonedir)"' \ - -DTZDEFAULT='"$(localtime-file)"' \ +tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ + -DTZDEFAULT='"/etc/localtime"' \ ! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ ! -DTZDEFAULT='"/etc/localtime"' \ -DTZDEFRULES='"$(posixrules-file)"' CFLAGS-tzfile.c = $(tz-cflags) diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/timezone/Makefile ./timezone/Makefile --- ../glibc-2.2.5/timezone/Makefile Wed Aug 29 16:45:25 2001 +++ ./timezone/Makefile Fri Feb 22 21:18:09 2002 @@ -159,8 +159,8 @@ diff -r -c glibc-2.2.4/timezone/Makefile glibc-2.2.4-new/timezone/Makefile *** glibc-2.2.4/timezone/Makefile Mon Jul 23 20:58:05 2001 --- glibc-2.2.4-new/timezone/Makefile Tue Apr 16 15:11:09 2002 *************** *** 159,166 **** $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o ! tz-cflags = -DTZDIR='"$(zonedir)"' \ ! -DTZDEFAULT='"$(localtime-file)"' \ -DTZDEFRULES='"$(posixrules-file)"' \ -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone --- 159,166 ---- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o -tz-cflags = -DTZDIR='"$(zonedir)"' \ - -DTZDEFAULT='"$(localtime-file)"' \ +tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ + -DTZDEFAULT='"/etc/localtime"' \ ! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \ ! -DTZDEFAULT='"/etc/localtime"' \ -DTZDEFRULES='"$(posixrules-file)"' \ -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
Docs/manual.texi +54 −9 Original line number Diff line number Diff line Loading @@ -30373,6 +30373,9 @@ stored into a temporary table) is calculated in MySQL Version @item expr2 or expr3 returns an integer @tab integer @end multitable If expr2 and expr3 are strings, then the result is case sensitive if both strings are case sensitive. (Starting from 3.23.51) @findex CASE @item CASE value WHEN [compare-value] THEN result [WHEN [compare-value] THEN result ...] [ELSE result] END @item CASE WHEN [condition] THEN result [WHEN [condition] THEN result ...] [ELSE result] END Loading Loading @@ -35268,6 +35271,9 @@ Note that if you use any other option to @code{ALTER TABLE} than if the data wouldn't strictly need to be copied (like when you change the name of a column). We plan to fix this in the future, but as one doesn't normally do @code{ALTER TABLE} that often this isn't that high on our TODO. For MyISAM tables, you can speed up the index recreation part (which is the slowest part of the recreation process) by setting the @code{myisam_sort_buffer_size} variable to a high value. @itemize @bullet @item Loading Loading @@ -45806,9 +45812,6 @@ Another common reason to receive the @code{MySQL server has gone away} error is because you have issued a ``close'' on your MySQL connection and then tried to run a query on the closed connection. You can check that the MySQL hasn't died by executing @code{mysqladmin version} and examining the uptime. If you have a script, you just have to issue the query again for the client to do an automatic reconnection. Loading @@ -45823,6 +45826,15 @@ server. to the server, but it didn't get a full answer (or any answer) to the question. @end multitable You will also get this error if someone has kills the running thread with @code{kill #threadid#}. You can check that the MySQL hasn't died by executing @code{mysqladmin version} and examining the uptime. If the problem is that mysqld crashed you should concentrate one finding the reason for the crash. You should in this case start by checking if issuing the query again will kill MySQL again. @xref{Crashing}. You can also get these errors if you send a query to the server that is incorrect or too large. If @code{mysqld} gets a packet that is too large or out of order, it assumes that something has gone wrong with the client and Loading @@ -45833,6 +45845,26 @@ starting @code{mysqld} with the @code{-O max_allowed_packet=#} option use more memory only when you issue a big query or when @code{mysqld} must return a big result row! If you want to make a bug report regarding this problem, be sure that you include the following information: @itemize @bullet @item Include information if MySQL died or not. (You can find this in the @code{hostname.err file}. @xref{Crashing}. @item If a specific query kills @code{mysqld} and the involved tables where checked with @code{CHECK TABLE} before you did the query, can you do a test case for this? @xref{Reproduceable test case}. @item What is the value of the @code{wait_timeout} variable in the MySQL server ? @code{mysqladmin variables} gives you the value of this @item Have you tried to run @code{mysqld} with @code{--log} and check if the issued query appears in the log ? @end itemize @xref{Asking questions}. @node Can not connect to server, Blocked host, Gone away, Common errors @appendixsubsec @code{Can't connect to [local] MySQL server} Error Loading Loading @@ -49371,19 +49403,32 @@ not yet 100% confident in this code. @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 when used with big ( > 64K) strings. Fixed the result from @code{IF()} is case in-sensitive if the 2 and third arguments are case sensitive. @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 Fixed problem with @code{crash-me} and gcc 3.0.4. @item Fixed that @code{@@@@unknown_variable} doesn't hang server. @item Added @code{@@@@VERSION} as a synonym for @code{VERSION()}. @item @code{SHOW VARIABLES LIKE 'xxx'} is now case insensitive. @item Fixed timeout for @code{GET_LOCK()} on HPUX with DCE threads. @item Fixed memory allocation bug in the glibc library used to build Linux binaries, which caused mysqld to die in 'free()'. @item Fixed @code{SIGINT} and @code{SIGQUIT} problems in @code{mysql}. @item Fixed bug in character table converts when used with big ( > 64K) strings. @item @code{InnoDB} now retains foreign key constraints through @code{ALTER TABLE} and @code{CREATE/DROP INDEX}. @item
client/mysql.cc +9 −14 Original line number Diff line number Diff line /* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000-2002 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Loading Loading @@ -354,18 +354,6 @@ int main(int argc,char *argv[]) mysql_thread_id(&mysql),mysql_get_server_info(&mysql)); put_info((char*) glob_buffer.ptr(),INFO_INFO); #ifdef HAVE_OPENSSL if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) { sprintf((char*) glob_buffer.ptr(), "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); put_info((char*) glob_buffer.ptr(),INFO_INFO); } else put_info("SSL is not in use\n",INFO_INFO); #endif /* HAVE_OPENSSL */ #ifdef HAVE_READLINE initialize_readline(my_progname); if (!status.batch && !quick && !opt_html && !opt_xml) Loading Loading @@ -697,7 +685,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case 'p': if (argument == disabled_my_option) opt_password= ""; opt_password= (char*) ""; else { if (argument) Loading Loading @@ -2329,6 +2317,13 @@ com_status(String *buffer __attribute__((unused)), tee_fprintf(stdout, "Current user:\t\t%s\n",cur[1]); (void) mysql_fetch_row(result); // Read eof } #ifdef HAVE_OPENSSL if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) tee_fprintf(stdout, "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); else #endif /* HAVE_OPENSSL */ tee_puts("SSL is not in use\n", stdout); } else { Loading
configure.in +6 −6 Original line number Diff line number Diff line Loading @@ -882,9 +882,9 @@ case $SYSTEM_TYPE in CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS"; ;; *hpux10.20*) echo "Enabling snprintf workaround for hpux 10.20" CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE" echo "Enabling workarounds for hpux 10.20" CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" if test "$with_named_thread" = "no" then echo "Using --with-named-thread=-lpthread" Loading @@ -892,9 +892,9 @@ case $SYSTEM_TYPE in fi ;; *hpux11.*) echo "Enabling pread/pwrite workaround for hpux 11" CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS" echo "Enabling workarounds for hpux 11" CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" if test "$with_named_thread" = "no" then echo "Using --with-named-thread=-lpthread" Loading
