Commit 25a129c9 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Force close of sockets on HPUX 10.20 

Support option lines longer than 256 chars.
Close the slow log at shutdown.
Always allow debug options to mysqld.
Change some DBUG_PRINT tags.
parent 74ca91e0

Docs/manual.texi

+10 −10
Original line number Diff line number Diff line
@@ -10265,9 +10265,10 @@ the priority of only one query, or by 
thread.  @xref{Table locking}.















@item --memlock













Lock the @code{mysqld} process in memory.  This works only if your system













supports the @code{mlockall()} system call.  This may help if you have













a problem where the operating system is causing @code{mysqld} to swap on disk.













Lock the @code{mysqld} process in memory.  This works only if your













system supports the @code{mlockall()} system call (like Solaris).  This













may help if you have a problem where the operating system is causing













@code{mysqld} to swap on disk.





























@item --myisam-recover [=option[,option...]]] where option is one of DEFAULT, BACKUP, FORCE or QUICK.















If this option is used, @code{mysqld} will on open check if the table is










@@ -33010,10 +33011,10 @@ Flush logs once all tables are locked.













Temporary directory (instead of /tmp).















@end table



























You can use 'perldoc mysqlhotcopy' to get a more complete documentation for













@code{mysqlhotcopy}.













You can use @code{perldoc mysqlhotcopy} to get a more complete













documentation for @code{mysqlhotcopy}.



























@code{mysqlhotcopy} reads the groups @code[client] and  @code{[mysqlhotcopy]}













@code{mysqlhotcopy} reads the groups @code{client} and  @code{mysqlhotcopy}















from the option files.





























To be able to execute @code{mysqlhotcopy} you need write access to the










@@ -44400,6 +44401,8 @@ not yet 100% confident in this code.













@appendixsubsec Changes in release 3.23.39















@itemize @bullet















@item













Extended argument length in option files from 256 to 512 chars.













@item















Fixed problem with shutdown when @code{INSERT DELAYED} was waiting for















a @code{LOCK TABLE}.















@item










@@ -50385,10 +50388,7 @@ On some operating systems, the error log will contain a stack trace if













@code{mysqld} dies unexpectedly. You can use this to find out where (and















maybe why) @code{mysqld} died. @xref{Error log}.  To get a stack trace,















you should NOT compile @code{mysqld} with the @code{-fomit-frame-pointer}













option to gcc. On Linux-x86 you can use













@code{-fomit-frame-pointer -ffixed-ebp} to get both speed and a reasonable













accurate stack trace.













@xref{Compiling for debugging}.













option to gcc. @xref{Compiling for debugging}.





























If the error file contains something like the following:







































configure.in



+5
−5






























Original line number
Diff line number
Diff line








@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.













AC_INIT(sql/mysqld.cc)















AC_CANONICAL_SYSTEM















# The Docs Makefile.am parses this line!













AM_INIT_AUTOMAKE(mysql, 3.23.38)













AM_INIT_AUTOMAKE(mysql, 3.23.39)















AM_CONFIG_HEADER(config.h)































PROTOCOL_VERSION=10










@@ -751,8 +751,8 @@ case $SYSTEM_TYPE in













    ;;















  *hpux10.20*)















    echo "Enabling snprintf workaround for hpux 10.20"













    CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF"













    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG"













    CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ"













    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ"















    ;;















  *hpux11.*)















    echo "Enabling pread/pwrite workaround for hpux 11"










@@ -806,8 +806,8 @@ case $SYSTEM_TYPE in













    ;;















    *aix4.3*)















      echo "Adding defines for AIX"













      CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS"













      CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS"













      CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"













      CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"















    ;;















dnl Is this the right match for DEC OSF on alpha?















    *dec-osf*)

































mysql-test/t/merge.test



+1
−0






























Original line number
Diff line number
Diff line








@@ -109,3 +109,4 @@ insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6);













insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6);















flush tables;















select * from t3 where a=1 order by b limit 2;













drop table t1,t2,t3;
























mysys/default.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -222,7 +222,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,













				   const char *dir, const char *config_file,















				   const char *ext, TYPELIB *group)















{













  char name[FN_REFLEN+10],buff[257],*ptr,*end,*value,*tmp;













  char name[FN_REFLEN+10],buff[FN_REFLEN+1],*ptr,*end,*value,*tmp;















  FILE *fp;















  uint line=0;















  my_bool read_values=0,found_group=0;

































mysys/mf_keycache.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -381,7 +381,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error)













  reg1 SEC_LINK *next,**start;































#if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)













  DBUG_EXECUTE("check_keycache",test_key_cache("start of find_key_block",0););













  DBUG_EXECUTE("check_keycache2",test_key_cache("start of find_key_block",0););















#endif































  *error=0;










@@ -459,7 +459,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error)













  }















  _my_used_last=next;















#if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)













  DBUG_EXECUTE("check_keycache",test_key_cache("end of find_key_block",0););













  DBUG_EXECUTE("check_keycache2",test_key_cache("end of find_key_block",0););















#endif















  return next;















} /* find_key_block */