Merge

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
sql/Makefile.am:
  SCCS 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

 heikki@donna.mysql.fi
+jcole@abel.spaceapes.com
 monty@donna.mysql.fi
 monty@work.mysql.com
 paul@central.snake.net

Build-tools/Do-patch-file

@@ -14,6 +14,7 @@ OLD="mysql-$PVER.tar.gz"
 RESULT="mysql-$PVER-$VER.patch.gz"
 PATCH_DIR=/my/web/Downloads-live/Patches
 RESULT_DIR=/my/web/Downloads-live/MySQL-3.23
+RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-3.23
 
 if test ! -f $NEWDIR/$NEW
 then
@@ -39,4 +40,5 @@ chmod a+r,o-w $RESULT binary/*
 mv $RESULT $PATCH_DIR
 cp binary/mysqlcom-* binary/mysql*win* /net/web/home/production/data/nweb/customer/Downloads
 rm binary/mysqlcom-*
+mv binary/*Max* $RESULT_DIR_MAX
 cp binary/* $RESULT_DIR

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:

client/mysql.cc

@@ -41,7 +41,7 @@
 #include "my_readline.h"
 #include <signal.h>
 
-const char *VER="11.14";
+const char *VER="11.15";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -280,6 +280,11 @@ int main(int argc,char *argv[])
 
   strmov(outfile, "\0");   // no (default) outfile, unless given at least once
   strmov(pager, "stdout"); // the default, if --pager wasn't given
+  {
+    char *tmp=getenv("PAGER");
+    if (tmp)
+      strmov(default_pager,tmp);
+  }
   if (!isatty(0) || !isatty(1))
   {
     status.batch=1; opt_silent=1;

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
@@ -724,7 +727,7 @@ int main()
 # Some system specific hacks
 #
 
-MAX_C_OPTIMIZE="-O6"
+MAX_C_OPTIMIZE="-O3"
 
 case $SYSTEM_TYPE in
   *solaris2.7*)
@@ -828,6 +831,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
 
 
@@ -1135,8 +1147,16 @@ else
 fi
 #---END:
 
-# for user definable functions (must be checked after threads on AIX)
+# Check for dlopen, needed for user definable functions
+# This must be checked after threads on AIX
+# We only need this for mysqld, not for the clients.
+
+my_save_LIBS="$LIBS"
+LIBS=""
 AC_CHECK_LIB(dl,dlopen)
+LIBDL=$LIBS
+LIBS="$my_save_LIBS"
+AC_SUBST(LIBDL)
 
 # System characteristics
 AC_SYS_RESTARTABLE_SYSCALLS
@@ -1366,8 +1386,8 @@ 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 \
- dlopen dlerror fchmod getpass getpassphrase initgroups mlockall)
+ pthread_condattr_create rwlock_init pthread_rwlock_rdlock pthread_yield\
+ fchmod getpass getpassphrase initgroups mlockall)
 
 # Sanity check: We chould not have any fseeko symbol unless
 # large_file_support=yes
@@ -1378,6 +1398,11 @@ then
 fi]
 )
 
+my_save_LIBS="$LIBS"
+LIBS="$LIBS $LIBDL"
+AC_CHECK_FUNCS(dlopen dlerror)
+LIBS="$my_save_LIBS"
+
 # Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)
 ac_save_CXXFLAGS="$CXXFLAGS"
 AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,
@@ -1659,10 +1684,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/configure.in

@@ -7,8 +7,9 @@ AM_INIT_AUTOMAKE(ib, 0.90)
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_INSTALL
-AC_CHECK_HEADERS(aio.h)
+AC_CHECK_HEADERS(aio.h sched.h)
 AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_FUNCS(sched_yield)
 AC_C_INLINE
 AC_C_BIGENDIAN
 

innobase/include/univ.i

@@ -39,6 +39,10 @@ subdirectory of 'mysql'. */
 /* Include the header file generated by GNU autoconf */
 #include "../ib_config.h"
 
+#ifdef HAVE_SCHED_H
+#include <sched.h>
+#endif
+
 #ifdef HAVE_PREAD
 #define HAVE_PWRITE
 #endif

innobase/os/os0thread.c

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

libmysql/Makefile.shared

@@ -83,9 +83,9 @@ ctype_extra_sources.c: conf_to_src
 	              $(srcdir)/ctype_extra_sources.c
 conf_to_src_SOURCES = conf_to_src.c
 conf_to_src_LDADD=
-#for --with-other-libc to ensure static linking
-#note -all-static rather than -static
-#this is needed for libtool to work right
-conf_to_src_LDFLAGS=-all-static
+#force static linking of conf_to_src - essential when linking against
+#custom installation of libc
+conf_to_src_LDFLAGS=@NOINST_LDFLAGS@
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%

libmysql/libmysql.c

@@ -1657,6 +1657,7 @@ mysql_close(MYSQL *mysql)
     {
       free_old_query(mysql);
       mysql->status=MYSQL_STATUS_READY; /* Force command */
+      mysql->reconnect=0;
       simple_command(mysql,COM_QUIT,NullS,0,1);
       end_server(mysql);
     }

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"
 }
 
 
@@ -211,6 +212,9 @@ SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err"
 
 SMALL_SERVER="-O key_buffer_size=1M -O sort_buffer=256K -O max_heap_table_size=1M"
 
+export MASTER_MYPORT
+export SLAVE_MYPORT
+
 if [ x$SOURCE_DIST = x1 ] ; then
  MY_BASEDIR=$MYSQL_TEST_DIR
 else

mysql-test/r/fulltext.result

@@ -21,3 +21,7 @@ t2	CREATE TABLE `t2` (
   FULLTEXT KEY `tix` (`inhalt`)
 ) TYPE=MyISAM
 ticket	inhalt
+ticket	inhalt
+3	foobar
+ticket	inhalt
+3	foobar

mysql-test/r/heap.result

@@ -78,3 +78,10 @@ f1	f2
 12	ted
 12	ted
 12	ted
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	ALL	btn	NULL	NULL	NULL	14	where used
+btn
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	ALL	btn	NULL	NULL	NULL	14	where used
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	ref	btn	btn	11	const,const	10	where used

mysql-test/r/rpl000001.result

@@ -5,8 +5,6 @@ sum(length(word))
 71
 (@id := id) - id
 0
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	1	master-bin.001	939	No			1053	Slave: query ' update t1 set n = n + get_lock('crash_lock', 2)' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0
 count(*)
 10
 n

mysql-test/t/fulltext.test

@@ -42,7 +42,10 @@ ticket2.id = ttxt.ticket
 WHERE t1.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');
 
 INSERT INTO t1 VALUES (3,3);
-select t1.id FROM t2 as ttxt,t1 INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ticket WHERE t1.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');
+select t1.id FROM t2 as ttxt,t1
+INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ticket
+WHERE t1.id = ticket2.ticket and
+      match(ttxt.inhalt) against ('foobar');
 
 # Check that we get 'fulltext' index in SHOW CREATE
 
@@ -53,4 +56,9 @@ show create table t2;
 
 select * from t2 where MATCH inhalt AGAINST (NULL);
 
+# MATCH in HAVING (pretty useless, but still it should work)
+
+select * from t2 where  MATCH inhalt AGAINST ('foobar');
+select * from t2 having MATCH inhalt AGAINST ('foobar');
+
 drop table t1,t2;

mysql-test/t/heap.test

@@ -2,6 +2,7 @@
 # Test of heap tables.
 #
 
+drop table if exists t1;
 create table t1 (a int not null,b int not null, primary key (a)) type=heap comment="testing heaps" avg_row_length=100 min_rows=1 max_rows=100;
 insert into t1 values(1,1),(2,2),(3,3),(4,4);
 delete from t1 where a=1 or a=0;
@@ -85,3 +86,17 @@ INSERT into t1 set f1=12,f2="ted";
 delete from t1 where f2="bill";
 select * from t1;
 drop table t1;
+
+#
+# Test when using part key searches
+#
+
+create table t1 (btn char(10) not null, key(btn)) type=heap;
+insert into t1 values ("hello"),("hello"),("hello"),("hello"),("hello"),("a"),("b"),("c"),("d"),("e"),("f"),("g"),("h"),("i");
+explain select * from t1 where btn like "q%";
+select * from t1 where btn like "q%";
+alter table t1 add column new_col char(1) not null, add key (btn,new_col), drop key btn;
+update t1 set new_col=btn;
+explain select * from t1 where btn="a";
+explain select * from t1 where btn="a" and new_col="a";
+drop table t1;

mysql-test/t/rpl000001.test

 source include/master-slave.inc;
 connection master;
 use test;
-drop table if exists t1;
+drop table if exists t1,t3;
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
-drop table if exists foo;
 set password = password('foo');
 set password = password('');
-create table foo(n int);
-insert into foo values(1),(2);
+create table t3(n int);
+insert into t3 values(1),(2);
 save_master_pos;
 connection slave;
 sync_with_master;
 use test;
-select * from foo;
+select * from t3;
 select sum(length(word)) from t1;
 connection master;
-drop table t1;
+drop table t1,t3;
 save_master_pos;
 connection slave;
 sync_with_master;
@@ -59,7 +58,12 @@ connection slave;
 sync_with_master ;
 #give the slave a chance to exit
 sleep 0.5;
-show slave status;
+
+# The following test can't be done because the result of Pos will differ
+# on different computers
+# --replace_result 9306 9999 3334 9999 3335 9999
+# show slave status;
+
 set sql_slave_skip_counter=1;
 slave start;
 select count(*) from t1;

mysql-test/t/rpl000015.test

@@ -10,22 +10,22 @@ reset slave;
 show slave status;
 change master to master_host='127.0.0.1';
 show slave status;
-change master to master_host='127.0.0.1',master_user='root',
- master_password='',master_port=9306;
+eval change master to master_host='127.0.0.1',master_user='root',
+ master_password='',master_port=$MASTER_MYPORT;
 show slave status;
 slave start;
 sync_with_master;
 show slave status;
 connection master;
-drop table if exists foo;
-create table foo (n int);
-insert into foo values (10),(45),(90);
+drop table if exists t1;
+create table t1 (n int);
+insert into t1 values (10),(45),(90);
 save_master_pos;
 connection slave;
 sync_with_master;
-select * from foo;
+select * from t1;
 connection master;
-drop table foo;
+drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;

mysql-test/t/rpl000016.test

@@ -7,9 +7,11 @@ connection slave;
 !slave start;
 system chmod 600 var/slave-data/master.info;
 !slave start;
-!change master to master_host='127.0.0.1',master_port=9306,master_user='root'; 
+!eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
+ master_user='root'; 
 reset slave;
-!change master to master_host='127.0.0.1',master_port=9306,master_user='root'; 
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
+ master_user='root'; 
 connection master;
 reset master;
 connection slave;

mysys/my_alloc.c

@@ -24,7 +24,7 @@
 void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size)
 {
   mem_root->free=mem_root->used=0;
-  mem_root->min_malloc=16;
+  mem_root->min_malloc=32;
   mem_root->block_size=block_size-MALLOC_OVERHEAD-sizeof(USED_MEM)-8;
   mem_root->error_handler=0;
 #if !(defined(HAVE_purify) && defined(EXTRA_DEBUG))

scripts/mysql_install_db.sh

@@ -79,14 +79,18 @@ then
   basedir=@prefix@
   bindir=@bindir@
   execdir=@libexecdir@ 
-elif test -d "$basedir/libexec"
-then
+else
   bindir="$basedir/bin"
+if test -x "$basedir/libexec/mysqld"
+then
   execdir="$basedir/libexec"
+elif test -x "@libexecdir@/mysqld"
+then
+  execdir="@libexecdir@"
 else
-  bindir="$basedir/bin"
   execdir="$basedir/bin"
 fi
+fi
 
 mdata=$ldata/mysql
 

scripts/mysql_zap.sh

@@ -36,7 +36,7 @@ while ($#ARGV >= $[ && $ARGV[0] =~ /^-/) {
     {
 	$opt_a = 1;
     }
-    elsif ($ARGV[0] eq "-?" || $ARGV[0] eq "-I")
+    elsif ($ARGV[0] eq "-?" || $ARGV[0] eq "-I" || $ARGV[0] eq "--help")
     {
 	&usage;
     }
@@ -107,7 +107,7 @@ EOF
 
 sub usage {
     print <<EOF;
-Usage:   $0 [-signal] [-?Ift] pattern
+Usage:   $0 [-signal] [-?Ift] [--help] pattern
 Options: -I or -? "info"  -f "force" -t "test".
 
 Version 1.0

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/Makefile.am

@@ -43,7 +43,7 @@ LDADD =			../isam/libnisam.a \
 mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
 			@bdb_libs@ @innodb_libs@ @pstack_libs@ \
                         @gemini_libs@ \
-			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS)
+			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@
 noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			item_strfunc.h item_timefunc.h item_uniq.h \
 			item_create.h mysql_priv.h \

sql/field.cc

@@ -1791,7 +1791,8 @@ String *Field_float::val_str(String *val_buffer,
 #endif
     memcpy_fixed((byte*) &nr,ptr,sizeof(nr));
 
-  val_buffer->alloc(max(field_length,70));
+  uint to_length=max(field_length,70);
+  val_buffer->alloc(to_length);
   char *to=(char*) val_buffer->ptr();
 
   if (dec >= NOT_FIXED_DEC)
@@ -1841,8 +1842,9 @@ String *Field_float::val_str(String *val_buffer,
     while (tmp_dec--)
       *to++= *pos++;
 #else
-#ifdef HAVE_SNPRINTF_
-    sprintf(to,val_buffer->length(),"%.*f",dec,nr);
+#ifdef HAVE_SNPRINTF
+    to[to_length-1]=0;			// Safety
+    snprintf(to,to_length-1,"%.*f",dec,nr);
 #else
     sprintf(to,"%.*f",dec,nr);
 #endif

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=2663113L;  best_t1=1175350L;  best_t2=7404531L;  best_type=4; /* mode=4327  add=3  type: 0 */
   if (get_options(argc,(char **) argv))
     exit(1);
 

sql/ha_heap.h

@@ -78,10 +78,3 @@ class ha_heap: public handler
 			     enum thr_lock_type lock_type);
 
 };
-
-
-
-
-
-
-

sql/item.h

@@ -298,8 +298,8 @@ public:
 
 class Item_ref :public Item_ident
 {
-  Item **ref;
 public:
+  Item **ref;
   Item_ref(char *db_par,char *table_name_par,char *field_name_par)
     :Item_ident(db_par,table_name_par,field_name_par),ref(0) {}
   Item_ref(Item **item, char *table_name_par,char *field_name_par)

sql/item_func.cc

@@ -1961,12 +1961,15 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
 
   while ((item=li++))
   {
-    if (item->type() != Item::FIELD_ITEM || item->fix_fields(thd,tlist) ||
-	!item->used_tables())
+    if (item->fix_fields(thd,tlist))
+      return 1;
+    if (item->type() == Item::REF_ITEM)
+      li.replace(item= *((Item_ref *)item)->ref);
+    if (item->type() != Item::FIELD_ITEM || !item->used_tables())
       return 1;
     used_tables_cache|=item->used_tables();
   }
-  /* check that all columns comes from the same table */
+  /* check that all columns come from the same table */
   if (count_bits(used_tables_cache) != 1)
     return 1;
   const_item_cache=0;

sql/mini_client.cc

@@ -384,12 +384,16 @@ my_bool STDCALL mc_mysql_reconnect(MYSQL *mysql)
   MYSQL tmp_mysql;
   DBUG_ENTER("mc_mysql_reconnect");
 
+  if (!mysql->reconnect)
+    DBUG_RETURN(1);
+
   mc_mysql_init(&tmp_mysql);
   tmp_mysql.options=mysql->options;
   if (!mc_mysql_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd,
 			  mysql->db, mysql->port, mysql->unix_socket,
 			  mysql->client_flag))
     {
+      tmp_mysql.reconnect=0;
       mc_mysql_close(&tmp_mysql); 
       DBUG_RETURN(1);
     }
@@ -793,6 +797,7 @@ mc_mysql_close(MYSQL *mysql)
     {
       mc_free_old_query(mysql);
       mysql->status=MYSQL_STATUS_READY; /* Force command */
+      mysql->reconnect=0;
       mc_simple_command(mysql,COM_QUIT,NullS,0,1);
       mc_end_server(mysql);
     }

sql/opt_range.cc

@@ -924,6 +924,8 @@ get_mm_leaf(Field *field,KEY_PART *key_part,
     String tmp(buff1,sizeof(buff1)),*res;
     uint length,offset,min_length,max_length;
 
+    if (!field->optimize_range())
+      DBUG_RETURN(0);				// Can't optimize this
     if (!(res= value->val_str(&tmp)))
       DBUG_RETURN(&null_element);
 
@@ -971,7 +973,8 @@ get_mm_leaf(Field *field,KEY_PART *key_part,
                                   max_str+maybe_null,&min_length,&max_length);
       else
 #endif
-        like_error=like_range(res->ptr(),res->length(),wild_prefix,field_length,
+        like_error=like_range(res->ptr(),res->length(),wild_prefix,
+			      field_length,
                               min_str+offset,max_str+offset,
                               max_sort_char,&min_length,&max_length);
     }

sql/sql_select.cc

@@ -178,8 +178,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
       setup_fields(thd,tables,fields,1,&all_fields) ||
       setup_conds(thd,tables,&conds) ||
       setup_order(thd,tables,fields,all_fields,order) ||
-      setup_group(thd,tables,fields,all_fields,group,&hidden_group_fields) ||
-      setup_ftfuncs(thd,tables,ftfuncs))
+      setup_group(thd,tables,fields,all_fields,group,&hidden_group_fields))
     DBUG_RETURN(-1);				/* purecov: inspected */
 
   if (having)
@@ -191,6 +190,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
     if (having->with_sum_func)
       having->split_sum_func(all_fields);
   }
+  if (setup_ftfuncs(thd,tables,ftfuncs)) /* should be after having->fix_fields */
+    DBUG_RETURN(-1);
   /*
     Check if one one uses a not constant column with group functions
     and no GROUP BY.

strings/ctype-ujis.c

@@ -66,22 +66,22 @@ uchar NEAR to_lower_ujis[]=
   'h',	 'i',	'j',   'k',   'l',   'm',   'n',   'o',
   'p',	 'q',	'r',   's',   't',   'u',   'v',   'w',
   'x',	 'y',	'z',   '{',   '|',   '}',   '~',   '\177',
-  '\200','\201','\202','\203','\204','\205','\206','\207',
-  '\210','\211','\212','\213','\214','\215','\216','\217',
-  '\220','\221','\222','\223','\224','\225','\226','\227',
-  '\230','\231','\232','\233','\234','\235','\236','\237',
-  '\240','\241','\242','\243','\244','\245','\246','\247',
-  '\250','\251','\252','\253','\254','\255','\256','\257',
-  '\260','\261','\262','\263','\264','\265','\266','\267',
-  '\270','\271','\272','\273','\274','\275','\276','\277',
-  '\300','\301','\302','\303','\304','\305','\306','\307',
-  '\310','\311','\312','\313','\314','\315','\316','\317',
-  '\320','\321','\322','\323','\324','\325','\326','\327',
-  '\330','\331','\332','\333','\334','\335','\336','\337',
-  '\340','\341','\342','\343','\344','\345','\346','\347',
-  '\350','\351','\352','\353','\354','\355','\356','\357',
-  '\360','\361','\362','\363','\364','\365','\366','\367',
-  '\370','\371','\372','\373','\374','\375','\376','\377',
+  (uchar) '\200',(uchar) '\201',(uchar) '\202',(uchar) '\203',(uchar) '\204',(uchar) '\205',(uchar) '\206',(uchar) '\207',
+  (uchar) '\210',(uchar) '\211',(uchar) '\212',(uchar) '\213',(uchar) '\214',(uchar) '\215',(uchar) '\216',(uchar) '\217',
+  (uchar) '\220',(uchar) '\221',(uchar) '\222',(uchar) '\223',(uchar) '\224',(uchar) '\225',(uchar) '\226',(uchar) '\227',
+  (uchar) '\230',(uchar) '\231',(uchar) '\232',(uchar) '\233',(uchar) '\234',(uchar) '\235',(uchar) '\236',(uchar) '\237',
+  (uchar) '\240',(uchar) '\241',(uchar) '\242',(uchar) '\243',(uchar) '\244',(uchar) '\245',(uchar) '\246',(uchar) '\247',
+  (uchar) '\250',(uchar) '\251',(uchar) '\252',(uchar) '\253',(uchar) '\254',(uchar) '\255',(uchar) '\256',(uchar) '\257',
+  (uchar) '\260',(uchar) '\261',(uchar) '\262',(uchar) '\263',(uchar) '\264',(uchar) '\265',(uchar) '\266',(uchar) '\267',
+  (uchar) '\270',(uchar) '\271',(uchar) '\272',(uchar) '\273',(uchar) '\274',(uchar) '\275',(uchar) '\276',(uchar) '\277',
+  (uchar) '\300',(uchar) '\301',(uchar) '\302',(uchar) '\303',(uchar) '\304',(uchar) '\305',(uchar) '\306',(uchar) '\307',
+  (uchar) '\310',(uchar) '\311',(uchar) '\312',(uchar) '\313',(uchar) '\314',(uchar) '\315',(uchar) '\316',(uchar) '\317',
+  (uchar) '\320',(uchar) '\321',(uchar) '\322',(uchar) '\323',(uchar) '\324',(uchar) '\325',(uchar) '\326',(uchar) '\327',
+  (uchar) '\330',(uchar) '\331',(uchar) '\332',(uchar) '\333',(uchar) '\334',(uchar) '\335',(uchar) '\336',(uchar) '\337',
+  (uchar) '\340',(uchar) '\341',(uchar) '\342',(uchar) '\343',(uchar) '\344',(uchar) '\345',(uchar) '\346',(uchar) '\347',
+  (uchar) '\350',(uchar) '\351',(uchar) '\352',(uchar) '\353',(uchar) '\354',(uchar) '\355',(uchar) '\356',(uchar) '\357',
+  (uchar) '\360',(uchar) '\361',(uchar) '\362',(uchar) '\363',(uchar) '\364',(uchar) '\365',(uchar) '\366',(uchar) '\367',
+  (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377'
 };
 
 uchar NEAR to_upper_ujis[]=
@@ -102,22 +102,22 @@ uchar NEAR to_upper_ujis[]=
   'H',	 'I',	'J',   'K',   'L',   'M',   'N',   'O',
   'P',	 'Q',	'R',   'S',   'T',   'U',   'V',   'W',
   'X',	 'Y',	'Z',   '{',   '|',   '}',   '~',   '\177',
-  '\200','\201','\202','\203','\204','\205','\206','\207',
-  '\210','\211','\212','\213','\214','\215','\216','\217',
-  '\220','\221','\222','\223','\224','\225','\226','\227',
-  '\230','\231','\232','\233','\234','\235','\236','\237',
-  '\240','\241','\242','\243','\244','\245','\246','\247',
-  '\250','\251','\252','\253','\254','\255','\256','\257',
-  '\260','\261','\262','\263','\264','\265','\266','\267',
-  '\270','\271','\272','\273','\274','\275','\276','\277',
-  '\300','\301','\302','\303','\304','\305','\306','\307',
-  '\310','\311','\312','\313','\314','\315','\316','\317',
-  '\320','\321','\322','\323','\324','\325','\326','\327',
-  '\330','\331','\332','\333','\334','\335','\336','\337',
-  '\340','\341','\342','\343','\344','\345','\346','\347',
-  '\350','\351','\352','\353','\354','\355','\356','\357',
-  '\360','\361','\362','\363','\364','\365','\366','\367',
-  '\370','\371','\372','\373','\374','\375','\376','\377',
+  (uchar) '\200',(uchar) '\201',(uchar) '\202',(uchar) '\203',(uchar) '\204',(uchar) '\205',(uchar) '\206',(uchar) '\207',
+  (uchar) '\210',(uchar) '\211',(uchar) '\212',(uchar) '\213',(uchar) '\214',(uchar) '\215',(uchar) '\216',(uchar) '\217',
+  (uchar) '\220',(uchar) '\221',(uchar) '\222',(uchar) '\223',(uchar) '\224',(uchar) '\225',(uchar) '\226',(uchar) '\227',
+  (uchar) '\230',(uchar) '\231',(uchar) '\232',(uchar) '\233',(uchar) '\234',(uchar) '\235',(uchar) '\236',(uchar) '\237',
+  (uchar) '\240',(uchar) '\241',(uchar) '\242',(uchar) '\243',(uchar) '\244',(uchar) '\245',(uchar) '\246',(uchar) '\247',
+  (uchar) '\250',(uchar) '\251',(uchar) '\252',(uchar) '\253',(uchar) '\254',(uchar) '\255',(uchar) '\256',(uchar) '\257',
+  (uchar) '\260',(uchar) '\261',(uchar) '\262',(uchar) '\263',(uchar) '\264',(uchar) '\265',(uchar) '\266',(uchar) '\267',
+  (uchar) '\270',(uchar) '\271',(uchar) '\272',(uchar) '\273',(uchar) '\274',(uchar) '\275',(uchar) '\276',(uchar) '\277',
+  (uchar) '\300',(uchar) '\301',(uchar) '\302',(uchar) '\303',(uchar) '\304',(uchar) '\305',(uchar) '\306',(uchar) '\307',
+  (uchar) '\310',(uchar) '\311',(uchar) '\312',(uchar) '\313',(uchar) '\314',(uchar) '\315',(uchar) '\316',(uchar) '\317',
+  (uchar) '\320',(uchar) '\321',(uchar) '\322',(uchar) '\323',(uchar) '\324',(uchar) '\325',(uchar) '\326',(uchar) '\327',
+  (uchar) '\330',(uchar) '\331',(uchar) '\332',(uchar) '\333',(uchar) '\334',(uchar) '\335',(uchar) '\336',(uchar) '\337',
+  (uchar) '\340',(uchar) '\341',(uchar) '\342',(uchar) '\343',(uchar) '\344',(uchar) '\345',(uchar) '\346',(uchar) '\347',
+  (uchar) '\350',(uchar) '\351',(uchar) '\352',(uchar) '\353',(uchar) '\354',(uchar) '\355',(uchar) '\356',(uchar) '\357',
+  (uchar) '\360',(uchar) '\361',(uchar) '\362',(uchar) '\363',(uchar) '\364',(uchar) '\365',(uchar) '\366',(uchar) '\367',
+  (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377'
 };
 
 uchar NEAR sort_order_ujis[]=
@@ -138,22 +138,22 @@ uchar NEAR sort_order_ujis[]=
   'H',	 'I',	'J',   'K',   'L',   'M',   'N',   'O',
   'P',	 'Q',	'R',   'S',   'T',   'U',   'V',   'W',
   'X',	 'Y',	'Z',   '{',   '|',   '}',   '~',   '\177',
-  '\200','\201','\202','\203','\204','\205','\206','\207',
-  '\210','\211','\212','\213','\214','\215','\216','\217',
-  '\220','\221','\222','\223','\224','\225','\226','\227',
-  '\230','\231','\232','\233','\234','\235','\236','\237',
-  '\240','\241','\242','\243','\244','\245','\246','\247',
-  '\250','\251','\252','\253','\254','\255','\256','\257',
-  '\260','\261','\262','\263','\264','\265','\266','\267',
-  '\270','\271','\272','\273','\274','\275','\276','\277',
-  '\300','\301','\302','\303','\304','\305','\306','\307',
-  '\310','\311','\312','\313','\314','\315','\316','\317',
-  '\320','\321','\322','\323','\324','\325','\326','\327',
-  '\330','\331','\332','\333','\334','\335','\336','\337',
-  '\340','\341','\342','\343','\344','\345','\346','\347',
-  '\350','\351','\352','\353','\354','\355','\356','\357',
-  '\360','\361','\362','\363','\364','\365','\366','\367',
-  '\370','\371','\372','\373','\374','\375','\376','\377',
+  (uchar) '\200',(uchar) '\201',(uchar) '\202',(uchar) '\203',(uchar) '\204',(uchar) '\205',(uchar) '\206',(uchar) '\207',
+  (uchar) '\210',(uchar) '\211',(uchar) '\212',(uchar) '\213',(uchar) '\214',(uchar) '\215',(uchar) '\216',(uchar) '\217',
+  (uchar) '\220',(uchar) '\221',(uchar) '\222',(uchar) '\223',(uchar) '\224',(uchar) '\225',(uchar) '\226',(uchar) '\227',
+  (uchar) '\230',(uchar) '\231',(uchar) '\232',(uchar) '\233',(uchar) '\234',(uchar) '\235',(uchar) '\236',(uchar) '\237',
+  (uchar) '\240',(uchar) '\241',(uchar) '\242',(uchar) '\243',(uchar) '\244',(uchar) '\245',(uchar) '\246',(uchar) '\247',
+  (uchar) '\250',(uchar) '\251',(uchar) '\252',(uchar) '\253',(uchar) '\254',(uchar) '\255',(uchar) '\256',(uchar) '\257',
+  (uchar) '\260',(uchar) '\261',(uchar) '\262',(uchar) '\263',(uchar) '\264',(uchar) '\265',(uchar) '\266',(uchar) '\267',
+  (uchar) '\270',(uchar) '\271',(uchar) '\272',(uchar) '\273',(uchar) '\274',(uchar) '\275',(uchar) '\276',(uchar) '\277',
+  (uchar) '\300',(uchar) '\301',(uchar) '\302',(uchar) '\303',(uchar) '\304',(uchar) '\305',(uchar) '\306',(uchar) '\307',
+  (uchar) '\310',(uchar) '\311',(uchar) '\312',(uchar) '\313',(uchar) '\314',(uchar) '\315',(uchar) '\316',(uchar) '\317',
+  (uchar) '\320',(uchar) '\321',(uchar) '\322',(uchar) '\323',(uchar) '\324',(uchar) '\325',(uchar) '\326',(uchar) '\327',
+  (uchar) '\330',(uchar) '\331',(uchar) '\332',(uchar) '\333',(uchar) '\334',(uchar) '\335',(uchar) '\336',(uchar) '\337',
+  (uchar) '\340',(uchar) '\341',(uchar) '\342',(uchar) '\343',(uchar) '\344',(uchar) '\345',(uchar) '\346',(uchar) '\347',
+  (uchar) '\350',(uchar) '\351',(uchar) '\352',(uchar) '\353',(uchar) '\354',(uchar) '\355',(uchar) '\356',(uchar) '\357',
+  (uchar) '\360',(uchar) '\361',(uchar) '\362',(uchar) '\363',(uchar) '\364',(uchar) '\365',(uchar) '\366',(uchar) '\367',
+  (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375', (uchar) (uchar) '\376', (uchar) '\377'
 };
 
 

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
 
@@ -133,10 +134,10 @@ Summary: MySQL - server with Berkeley DB and Innodb support
 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.
+%description Max 
+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,15 +299,25 @@ 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
-   /sbin/chkconfig --del mysql
+  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
 # database files.