Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged

BUILD/SETUP.sh

@@ -43,8 +43,8 @@ alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet
 pentium_cflags="-mpentiumpro"
 sparc_cflags=""
 
-fast_cflags="-O6 -fno-omit-frame-pointer"
-reckless_cflags="-O6 -fomit-frame-pointer -ffixed-ebp"
+fast_cflags="-O3 -fno-omit-frame-pointer"
+reckless_cflags="-O3 -fomit-frame-pointer -ffixed-ebp"
 debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2"
 
 base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

BitKeeper/etc/logging_ok

-paul@central.snake.net
-monty@donna.mysql.fi
 heikki@donna.mysql.fi
+monty@donna.mysql.fi
+paul@central.snake.net
 serg@serg.mysql.com
+tim@threads.polyesthetic.msg

bdb/Makefile.in

@@ -36,7 +36,11 @@ subdirs = btree build_vxworks build_win32 clib common cxx db db185 \
 all:
 	cd $(bdb_build) && $(MAKE) all
 
-clean:;
+clean:
+	cd $(bdb_build) && $(MAKE) clean
+
+distclean:
+	cd $(bdb_build) && $(MAKE) distclean
 
 # May want to fix this, and MYSQL/configure, to install things
 install dvi check installcheck:

configure.in

@@ -359,6 +359,9 @@ else
     *darwin*)
       FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
       ;;
+    *cygwin*)
+      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
+      ;;
     *)
       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
   esac
@@ -691,7 +694,7 @@ int main()
 # Some system specific hacks
 #
 
-MAX_C_OPTIMIZE="-O6"
+MAX_C_OPTIMIZE="-O3"
 
 case $SYSTEM_TYPE in
   *solaris2.7*)
@@ -795,6 +798,15 @@ case $SYSTEM_TYPE in
       CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS"
       CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS"
     ;;
+dnl Is this the right match for DEC OSF on alpha?
+    *dec-osf*)
+      if test "$ac_cv_prog_gcc" = "yes" && test "$host_cpu" = "alpha"
+      then
+	  echo "Adding defines for DEC OSF on alpha"
+	  CFLAGS="$CFLAGS -mieee"
+	  CXXFLAGS="$CXXFLAGS -mieee"
+      fi
+    ;;
 esac
 
 
@@ -1333,7 +1345,7 @@ AC_CHECK_FUNCS(alarm bmove \
  sigset sigthreadmask pthread_sigmask pthread_setprio pthread_setprio_np \
  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 \
+ pthread_condattr_create rwlock_init pthread_rwlock_rdlock pthread_yield\
  dlopen dlerror fchmod getpass getpassphrase initgroups mlockall)
 
 # Sanity check: We chould not have any fseeko symbol unless
@@ -1605,10 +1617,11 @@ AC_ARG_WITH(bench,
 
 if test "$with_bench" = "yes"
 then
-  bench_dirs="sql-bench mysql-test"
+  bench_dirs="sql-bench"
 else
   bench_dirs=""
 fi
+bench_dirs="$bench_dirs mysql-test"
 AC_SUBST(bench_dirs)
 
 # Don't build readline, i have it already

include/global.h

@@ -28,6 +28,19 @@
 #include <os2.h>
 #endif /* __EMX__ */
 
+#ifdef __CYGWIN__
+/* We use a Unix API, so pretend it's not Windows */
+#undef WIN
+#undef WIN32
+#undef _WIN
+#undef _WIN32
+#undef _WIN64
+#undef __WIN__
+#undef __WIN32__
+#define HAVE_ERRNO_AS_DEFINE
+#endif /* __CYGWIN__ */
+
+
 #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
 #include <config-win.h>
 #else

innobase/os/os0thread.c

@@ -135,10 +135,12 @@ void
 os_thread_yield(void)
 /*=================*/
 {
-#ifdef __WIN__	
+#if defined(__WIN__)
 	Sleep(0);
-#else
+#elif defined(HAVE_PTHREAD_YIELD)
 	pthread_yield();
+#else
+        os_thread_sleep(0);
 #endif
 }
 

mysql-test/mysql-test-run.sh

@@ -24,10 +24,10 @@ PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin
 
 which ()
 {
-  DIRS=`echo $PATH | tr ":" " "`
+  IFS="${IFS=   }"; save_ifs="$IFS"; IFS=':'
   for file
   do
-    for dir in $DIRS
+    for dir in $PATH
     do
       if test -f $dir/$file
       then
@@ -38,6 +38,7 @@ which ()
     echo "which: no $file in ($PATH)"
     exit 1
   done
+  IFS="$save_ifs"
 }
 
 

scripts/safe_mysqld.sh

@@ -52,7 +52,15 @@ parse_arguments() {
       --core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core_file_size=;;"` ;;
       --timezone=*) TZ=`echo "$arg" | sed -e "s;--timezone=;;"` ; export TZ; ;;
       --mysqld=*)   MYSQLD=`echo "$arg" | sed -e "s;--mysqld=;;"` ;;
-      --mysqld-version=*) MYSQLD=mysqld-`echo "$arg" | sed -e "s;--mysqld-version=;;"` ;;
+      --mysqld-version=*)
+	tmp=`echo "$arg" | sed -e "s;--mysqld-version=;;"`
+	if test -n "$tmp"
+	then
+	  MYSQLD="mysqld-$tmp"
+	else
+	  MYSQLD="mysqld"
+	fi
+	;;
       *)
         if test -n "$pick_args"
         then
@@ -73,7 +81,7 @@ then
   MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
   ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
   DATADIR=$MY_BASEDIR_VERSION/data
-  if test -z "defaults"
+  if test -z "$defaults"
   then
     defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
   fi

sql/gen_lex_hash.cc

@@ -472,7 +472,7 @@ int main(int argc,char **argv)
   int error;
 
   MY_INIT(argv[0]);
-  start_value=4997167L;  best_t1=4533271L;  best_t2=7512314L;  best_type=4;
+  start_value=6591595L; best_t1=6947666L;  best_t2=6561864L;  best_type=2; /* mode=4523  add=5  type: 0 */
   if (get_options(argc,(char **) argv))
     exit(1);
 

support-files/mysql.spec.sh

@@ -17,6 +17,7 @@ Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql
 Icon:		mysql.gif
 URL:		http://www.mysql.com/
 Packager:	David Axmark <david@mysql.com>
+Vendor:		MySQL AB
 Provides:	msqlormysql MySQL-server
 Obsoletes:	mysql
 
@@ -134,9 +135,9 @@ Group: Applications/Databases
 Obsoletes: mysql-Max
 
 %description Max 
-Extra MySQL server binary to get support extra features like
-transactional tables. To active these features on only have to install
-this package after the server package.
+Optional MySQL server binary that supports features
+like transactional tables. To active this binary, just install this
+package after the MySQL package.
 
 %prep
 %setup -n mysql-%{mysql_version}
@@ -151,11 +152,11 @@ BuildMySQL() {
 # support assembler speedups.
 sh -c  "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \
 	CC=\"${MYSQL_BUILD_CC:-egcs}\" \
-	CFLAGS=\"${MYSQL_BUILD_CFLAGS:- -O6 -fno-omit-frame-pointer}\" \
+	CFLAGS=\"${MYSQL_BUILD_CFLAGS:- -O3}\" \
 	CXX=\"${MYSQL_BUILD_CXX:-egcs}\" \
-	CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:- -O6 \
+	CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:- -O3 \
 	          -felide-constructors -fno-exceptions -fno-rtti \
-		  -fno-omit-frame-pointer}\" \
+		  }\" \
 	./configure \
  	    $* \
 	    --enable-assembler \
@@ -211,6 +212,9 @@ mv Docs/manual.ps Docs/manual.ps.save
 make distclean
 mv Docs/manual.ps.save Docs/manual.ps
 
+# RPM:s destroys Makefile.in files, so we generate them here
+automake
+
 BuildMySQL "--disable-shared" \
 	   "--with-mysqld-ldflags='-all-static'" \
 	   "--with-client-ldflags='-all-static'" \
@@ -295,14 +299,24 @@ chmod -R og-rw $mysql_datadir/mysql
 # Allow safe_mysqld to start mysqld and print a message before we exit
 sleep 2
 
+%post Max
+# Restart mysqld, to use the new binary.
+# There may be a better way to handle this.
+/etc/rc.d/init.d/mysql stop > /dev/null 2>&1
+echo "Giving mysqld a couple of seconds to restart"
+sleep 5
+/etc/rc.d/init.d/mysql start
+sleep 2
+
 %preun
-if test -x /etc/rc.d/init.d/mysql
-then
-  /etc/rc.d/init.d/mysql stop > /dev/null
-fi
-# Remove autostart of mysql
 if test $1 = 0
 then
+  if test -x /etc/rc.d/init.d/mysql
+  then
+    /etc/rc.d/init.d/mysql stop > /dev/null
+  fi
+
+  # Remove autostart of mysql
   /sbin/chkconfig --del mysql
 fi
 # We do not remove the mysql user since it may still own a lot of