Merge with 4.0

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment

11 files changed, 54 insertions, 49 deletions

diff --git a/strings/Makefile.am b/strings/Makefile.am
index 917183320e0..e53ff21cdf8 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -24,11 +24,11 @@ if ASSEMBLER_x86
 ASRCS		= strings-x86.s longlong2str-x86.s
 CSRCS		= bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype-bin.c
 else
-if ASSEMBLER_sparc
+if ASSEMBLER_sparc32
 # These file MUST all be on the same line!! Otherwise automake
 # generats a very broken makefile
-ASRCS		= bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
-CSRCS		= strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype-bin.c
+ASRCS		= bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s
+CSRCS		= strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c strxmov.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype-bin.c
 else
 #no assembler
 ASRCS		=
@@ -68,8 +68,11 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
 if ASSEMBLER
 # On Linux gcc can compile the assembly files
 %.o	: %.s
-	$(AS) -o $@ $<
+	$(AS) $(ASFLAGS) -o $@ $<
 endif
 
+str_test: str_test.c $(LIBRARIES)
+	$(LINK) $(FLAGS) -DMAIN $(srcdir)/str_test.c $(LDADD) $(LIBS)
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/strings/bmove_upp-sparc.s b/strings/bmove_upp-sparc.s
index 4fae7f5cc7c..f38c391f8ab 100644
--- a/strings/bmove_upp-sparc.s
+++ b/strings/bmove_upp-sparc.s
@@ -27,11 +27,11 @@ bmove_upp:
 	nop
 .loop:
 	sub	%o1, 1, %o1
-	ldub	[%o1], %g2
+	ldub	[%o1], %o3
 	sub	%o0, 1, %o0
 	subcc	%o2, 1, %o2
 	bcc	.loop
-	stb	%g2, [%o0]
+	stb	%o3, [%o0]
 .end:
 	retl
 	nop
diff --git a/strings/do_ctype.c b/strings/do_ctype.c
index 14ede6891da..f51770e3633 100644
--- a/strings/do_ctype.c
+++ b/strings/do_ctype.c
@@ -145,7 +145,7 @@ void init_case_convert()
   higher_pos= (uchar * ) "\217\216\231\232\220"; /* Extra chars to konv. */
   lower_pos=  (uchar * ) "\206\204\224\201\202";
 #else
-#if defined(HPUX) && ASCII_BITS_USED == 8
+#if defined(HPUX10) && ASCII_BITS_USED == 8
   higher_pos= (uchar * ) "\xd0\xd8\xda\xdb\xdc\xd3";
   lower_pos=  (uchar * ) "\xd4\xcc\xce\xdf\xc9\xd7";
 #else
@@ -160,7 +160,7 @@ void init_case_convert()
   lower_pos=  (uchar * ) "{}|`~";
 #endif
 #endif /* USE_INTERNAL_CTYPE */
-#endif /* HPUX */
+#endif /* HPUX10 */
 #endif /* MSDOS */
 
   while (*higher_pos)
@@ -176,7 +176,7 @@ void init_case_convert()
   higher_pos= (uchar *) "\217\216\231\232\220";
   lower_pos=  (uchar *) "\216\217\231YE";
 #else
-#if defined(HPUX) && ASCII_BITS_USED == 8
+#if defined(HPUX10) && ASCII_BITS_USED == 8
   higher_pos= lower_pos= (uchar *) "";		/* Tecknen i r{tt ordning */
 #else
 #ifdef USE_ISO_8859_1				/* As in USG5 ICL-386 */
@@ -186,7 +186,7 @@ void init_case_convert()
   higher_pos= (uchar *) "][\\~`";		/* R{tt ordning p} tecknen */
   lower_pos= (uchar *)	"[\\]YE";		/* Ordning enligt ascii */
 #endif /* USE_ISO_8859_1 */
-#endif /* HPUX */
+#endif /* HPUX10 */
 #endif /* MSDOS */
 
   while (*higher_pos)
diff --git a/strings/str_test.c b/strings/str_test.c
index bef48814f6d..0c3ff471ad7 100644
--- a/strings/str_test.c
+++ b/strings/str_test.c
@@ -130,9 +130,6 @@ int main(void)
   if (errors)
     fputs("--- Some functions doesn't work!! Fix them\n",stderr);
   return(errors > 0);
-
-  fputs("Fatal error\n",stderr);
-  return(2);
 } /* main */
 
 
diff --git a/strings/strappend-sparc.s b/strings/strappend-sparc.s
index 69bb555aa47..30b621c3fce 100644
--- a/strings/strappend-sparc.s
+++ b/strings/strappend-sparc.s
@@ -22,28 +22,28 @@
 	.type	 strappend,#function
 	.proc	020
 strappend:
-	add	%o0, %o1, %g3		! g3 = endpos
-	ldsb	[%o0], %g2
+	add	%o0, %o1, %o3		! o3 = endpos
+	ldsb	[%o0], %o4
 .loop1:
 	add	%o0, 1, %o0		! find end of str
-	cmp	%g2, 0
+	cmp	%o4, 0
 	bne,a	.loop1
-	ldsb	[%o0], %g2
+	ldsb	[%o0], %o4
 	
 	sub	%o0, 1, %o0
-	cmp	%o0, %g3
+	cmp	%o0, %o3
 	bgeu	.end
 	nop
 	
 	stb	%o2, [%o0]
 .loop2:
 	add	%o0, 1, %o0
-	cmp	%o0, %g3
+	cmp	%o0, %o3
 	blu,a	.loop2
 	stb	%o2, [%o0]
 .end:
 	retl
-	stb	%g0, [%g3]
+	stb	%g0, [%o3]
 .strappend_end:
 	.size	 strappend,.strappend_end-strappend
 	.ident	"Matt Wagner & Monty"
diff --git a/strings/strend-sparc.s b/strings/strend-sparc.s
index fd1dba4d36f..0f19f6a435a 100644
--- a/strings/strend-sparc.s
+++ b/strings/strend-sparc.s
@@ -22,12 +22,12 @@
 	.type	 strend,#function
 	.proc	0102
 strend:
-	ldsb	[%o0], %g2		! Handle first char differently to make
+	ldsb	[%o0], %o3		! Handle first char differently to make
 .loop:					! a faster loop
 	add	%o0, 1, %o0
-	cmp	%g2, 0
+	cmp	%o3, 0
 	bne,a	.loop
-	ldsb	[%o0], %g2
+	ldsb	[%o0], %o3
 	retl
 	sub	%o0,1,%o0
 .strend_end:
diff --git a/strings/strmake-sparc.s b/strings/strmake-sparc.s
index 9fe72a9f9a2..4effe95774e 100644
--- a/strings/strmake-sparc.s
+++ b/strings/strmake-sparc.s
@@ -25,16 +25,16 @@ strmake:
 	orcc	%g0,%o2,%g0
 	be,a	.end
 	nop
-	ldsb	[%o1],%g2
+	ldsb	[%o1],%o3
 .loop:	
-	stb	%g2,[%o0]
-	cmp	%g2,0
+	stb	%o3,[%o0]
+	cmp	%o3,0
 	be	.end		! Jump to end on end of string
 	add	%o1,1,%o1
 	add	%o0,1,%o0
 	subcc	%o2,1,%o2
 	bne,a	.loop
-	ldsb	[%o1],%g2
+	ldsb	[%o1],%o3
 .end:
 	retl
 	stb	%g0,[%o0]
diff --git a/strings/strmov-sparc.s b/strings/strmov-sparc.s
index 6114b0bf6e2..3536685b47b 100644
--- a/strings/strmov-sparc.s
+++ b/strings/strmov-sparc.s
@@ -23,10 +23,10 @@
 	.proc	0102
 strmov:
 .loop:
-	ldub	[%o1], %g2
-	stb	%g2, [%o0]
+	ldub	[%o1], %o3
+	stb	%o3, [%o0]
 	add	%o1, 1, %o1
-	cmp	%g2, 0
+	cmp	%o3, 0
 	bne,a	.loop
 	add	%o0, 1, %o0
 	retl
diff --git a/strings/strnmov-sparc.s b/strings/strnmov-sparc.s
index 2dfcb95ab76..f681318f410 100644
--- a/strings/strnmov-sparc.s
+++ b/strings/strnmov-sparc.s
@@ -25,16 +25,16 @@ strnmov:
 	orcc	%g0,%o2,%g0
 	be,a	.end
 	nop
-	ldsb	[%o1],%g2
+	ldsb	[%o1],%o3
 .loop:	
-	stb	%g2,[%o0]
-	cmp	%g2,0
+	stb	%o3,[%o0]
+	cmp	%o3,0
 	be	.end		! Jump to end on end of string
 	add	%o1,1,%o1
 	add	%o0,1,%o0
 	subcc	%o2,1,%o2
 	bne,a	.loop
-	ldsb	[%o1],%g2
+	ldsb	[%o1],%o3
 .end:
 	retl
 	nop
diff --git a/strings/strstr-sparc.s b/strings/strstr-sparc.s
index 1263236f107..eb658e9f7f0 100644
--- a/strings/strstr-sparc.s
+++ b/strings/strstr-sparc.s
@@ -33,10 +33,10 @@ strstr:
 
 	ldsb	[%o1],%o2		! o2= First char of search
 .top:
-	ldsb	[%o0],%g3		! g3= First char of rest of str
-	cmp	%g3,0
+	ldsb	[%o0],%o4		! o4= First char of rest of str
+	cmp	%o4,0
 	be	.abort			! Found end null		; 
-	cmp	%g3,%o2
+	cmp	%o4,%o2
 	bne	.top
 	add	%o0,1,%o0
 
@@ -45,20 +45,20 @@ strstr:
 !      while (*j)
 !	if (*i++ != *j++) goto skipp;
 
-	or	%g0,%o0,%g2
-	add	%o1,1,%g3		! g3= search+1
+	or	%g0,%o0,%o3
+	add	%o1,1,%o4		! o4= search+1
 	ldsb	[%o0],%o5		! o5= [current_str+1]
 
 .loop2:
-	ldsb	[%g3],%g4
-	add	%g3,1,%g3
+	ldsb	[%o4],%g4
+	add	%o4,1,%o4
 	cmp	%g4,0
 	be	.end	
 	cmp	%o5,%g4
 	bne	.top
-	add	%g2,1,%g2
+	add	%o3,1,%o3
 	ba	.loop2
-	ldsb	[%g2],%o5
+	ldsb	[%o3],%o5
 
 .end:
 	retl
diff --git a/strings/strxmov-sparc.s b/strings/strxmov-sparc.s
index e65b56d317d..b4ca531d2e4 100644
--- a/strings/strxmov-sparc.s
+++ b/strings/strxmov-sparc.s
@@ -15,12 +15,17 @@
 ! Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ! MA 02111-1307, USA
 
+!
+! Note that this function only works on 32 bit sparc systems
+! on 64 bits the offsets to %sp are different !
+
 	.file	"strxmov-sparc.s"
 .section	".text"
 	.align 4
 	.global strxmov
 	.type	 strxmov,#function
 	.proc	0102
+	
 strxmov:
 	st	%o2, [%sp+76]		! store 3rd param before other params
 	st	%o3, [%sp+80]		! store 4th param "   "
@@ -28,18 +33,18 @@ strxmov:
 	st	%o4, [%sp+84]		! store 5th param
 	be	.end
 	st	%o5, [%sp+88]		! store last
-	add	%sp, 76, %g2		! put pointer to 3rd arg
+	add	%sp, 76, %o4		! put pointer to 3rd arg
 .loop:
-	ldub	[%o1], %g1		! set values of src (o1)
+	ldub	[%o1], %o5		! set values of src (o1)
 	add	%o1, 1, %o1		! inc src
-	stb	%g1, [%o0]		!   and dst (o2) equal
-	cmp	%g1, 0			! second while cmp
+	stb	%o5, [%o0]		!   and dst (o2) equal
+	cmp	%o5, 0			! second while cmp
 	bne,a	.loop
 	add	%o0, 1, %o0		! inc dst
-	ld	[%g2], %o1		! get next param
+	ld	[%o4], %o1		! get next param
 	cmp	%o1, 0			! check if last param
 	bne	.loop
-	add	%g2, 4, %g2		! advance to next param
+	add	%o4, 4, %o4		! advance to next param
 .end:
 	retl
 	stb	%g0, [%o0]