Merge serg@work.mysql.com:/home/bk/mysql

into infomag.ape.relarn.ru:/usr/home/serg/src/mysql.safe/bk/mysql

Build-tools/Do-all-build-steps

@@ -14,6 +14,7 @@ EXTRA_CONFIG="--without-perl"
 echo "Building on $to_host"
 
 rm -rf $BD/*
+rm -f $WD/binary/*
 mkdir -p $WD/Logs
 mkdir -p $BD/Logs
 
@@ -86,3 +87,7 @@ fi
 cd "$BD"
 DIST=`ls -t mysql-*.tar.gz | head -1`
 $BD/Build-tools/mysql-copyright --target=. $DIST
+
+# move the binaries to the 'binary' directory
+mv $BD/mysql*tar.gz $WD/binary
+mv $BD/NEW-RPMS/* $WD/binary

Build-tools/Do-compile

@@ -66,6 +66,7 @@ if ($opt_stage == 0)
   system("mkdir $host/test") if (! -d "$host/test");
   system("mkdir $host/bin") if (! -d "$host/bin");
   system("mkdir Logs") if (! -d "Logs");
+  system("mv $log ${log}-old") if (-f $log);
   unlink($log);
 }
 

Docs/manual.texi

@@ -28286,6 +28286,8 @@ aren't specified.
 You should have a primary key in the table.
 @item
 You should have a timestamp in all tables you want to be able to update.
+For maximum portability @code{TIMESTAMP(14)} or simple @code{TIMESTAMP}
+is recommended instead of other @code{TIMESTAMP(X)} variations.
 @item
 Only use double float fields. Access fails when comparing with single floats.
 @item

acconfig.h

@@ -50,6 +50,9 @@
 /* READLINE: */
 #undef HAVE_BSD_SIGNALS
 
+/* ZLIB and compress: */
+#undef HAVE_COMPRESS
+
 /* Define if we are using OSF1 DEC threads */
 #undef HAVE_DEC_THREADS
 

acinclude.m4

@@ -116,6 +116,25 @@ then
 fi
 ])
 
+AC_DEFUN(MYSQL_CHECK_ZLIB_WITH_COMPRESS, [
+save_LIBS="$LIBS"
+LIBS="-l$1 $LIBS"
+AC_CACHE_CHECK([if libz with compress], mysql_cv_compress,
+[AC_TRY_LINK([#include <zlib.h>
+#ifdef __cplusplus
+extern "C"
+#endif
+],
+[ return compress(0, (unsigned long*) 0, "", 0);
+], mysql_cv_compress=yes, mysql_cv_compress=no)])
+if test "$mysql_cv_compress" = "yes"
+then
+  AC_DEFINE(HAVE_COMPRESS)
+else
+  LIBS="$save_LIBS"
+fi
+])
+
 #---START: Used in for client configure
 AC_DEFUN(MYSQL_CHECK_ULONG,
 [AC_MSG_CHECKING(for type ulong)

configure.in

@@ -535,7 +535,7 @@ AC_CHECK_LIB(bind, bind)
 # For crypt() on Linux
 AC_CHECK_LIB(crypt,crypt)
 # For compress in zlib
-AC_CHECK_LIB($with_named_zlib,compress)
+MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
 
 if test "$IS_LINUX" = "true"; then
   AC_MSG_CHECKING([for atomic operations])
@@ -1217,7 +1217,7 @@ AC_CHECK_FUNCS(alarm bmove \
  pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \
  pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \
  pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
- crypt compress dlopen dlerror fchmod getpass getpassphrase initgroups)
+ crypt dlopen dlerror fchmod getpass getpassphrase initgroups)
 
 # Sanity check: We chould not have any fseeko symbol unless
 # large_file_support=yes

include/my_pthread.h

@@ -279,7 +279,7 @@ extern int my_pthread_create_detached;
 #endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
 
 #if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910
-int sigwait(const sigset_t *set, int *sig);
+int sigwait(sigset_t *set, int *sig);
 #endif
 
 #if defined(HAVE_UNIXWARE7_POSIX)
@@ -290,7 +290,7 @@ int sigwait(const sigset_t *set, int *sig);
 #ifndef HAVE_NONPOSIX_SIGWAIT
 #define my_sigwait(A,B) sigwait((A),(B))
 #else
-int my_sigwait(sigset_t *set,int *sig);
+int my_sigwait(const sigset_t *set,int *sig);
 #endif
 
 #ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
@@ -309,7 +309,7 @@ extern int my_pthread_cond_init(pthread_cond_t *mp,
 #endif
 
 #if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
-int sigwait(const sigset_t *setp, int *sigp);		/* Use our implemention */
+int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
 #endif
 #if !defined(HAVE_SIGSET) && !defined(HAVE_mit_thread) && !defined(sigset)
 #define sigset(A,B) do { struct sigaction s; sigset_t set;              \

mysys/my_pthread.c

@@ -102,7 +102,7 @@ int my_pthread_create_detached=1;
 
 int my_sigwait(const sigset_t *set,int *sig)
 {
-  int signal=sigwait(set);
+  int signal=sigwait((sigset_t*) set);
   if (signal < 0)
     return errno;
   *sig=signal;

mysys/thr_rwlock.c

@@ -65,8 +65,13 @@ int my_rwlock_init( rw_lock_t *rwp, void *arg __attribute__((unused)))
 
   pthread_mutex_init( &rwp->lock, NULL );
   pthread_condattr_init( &cond_attr );
+#ifdef HAVE_PTHREAD_CONDATTR_CREATE	/* HPUX 11.0 */
+  pthread_cond_init( &rwp->readers, cond_attr );
+  pthread_cond_init( &rwp->writers, cond_attr );
+#else
   pthread_cond_init( &rwp->readers, &cond_attr );
   pthread_cond_init( &rwp->writers, &cond_attr );
+#endif
   pthread_condattr_destroy(&cond_attr);
 
   rwp->state	= 0;

scripts/make_binary_distribution.sh

@@ -54,7 +54,7 @@ cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/
 cp -p scripts/* $BASE/bin
 rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh
 
-$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@prefix\@ . < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
+$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
 $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
 $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/safe_mysqld
 

sql-bench/compare-results.sh

@@ -301,7 +301,7 @@ EOF
 sub html_output
 {
   my $template="template.html";
-  my $title="MySQL Benchmark Results - Compare with $opt_cmp";
+  my $title="MySQL | | Information | Benchmarks | Compare with $opt_cmp";
   my $image="info.gif";
   $bar="";
 
@@ -318,18 +318,11 @@ sub html_output
       s|TITLE:SUBTITLE|$title|;
       print $_;
     }
-    elsif (m|/images/.gif|)
+    elsif (/TITLE:COMPARE/)
     {
-      s|/images/.gif|/images/$image|;
-      s|alt=""|alt="$title"|;
+      s|TITLE:COMPARE|$opt_cmp|;
       print $_;
     }
-    # Find line to inactivate
-    elsif (m|<img src="/images/${text}1.gif" border="0" width="66" height="20" alt="$text">|)
-    {
-      # Print inactive thing
-      print '<td align="center" bgcolor="#310063"><img src="/images/zero.gif" border="0" width="66" height="20" alt=""></td>';
-    }
     elsif (/ subchapter name /)
     {
       # Nothing here for now

sql/table.cc

@@ -543,7 +543,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
     (void) outparam->file->close();
  err_not_open:
   x_free((gptr) disk_buff);
-  delete crypted;
   VOID(my_close(file,MYF(MY_WME)));
 
  err_end:					/* Here when no file */