Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql

Docs/manual.texi:
  Auto merged

BUILD/compile-ia64-O0

-make -k clean
-/bin/rm -f */.deps/*.P config.cache
-
-aclocal; autoheader; aclocal; automake; autoconf
-
-CFLAGS="-O0 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O0 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
-make
-strip sql/mysqld
-
-
-
-

BUILD/compile-ia64-O0-sgicc

-make -k clean
-/bin/rm -f */.deps/*.P config.cache
-
-aclocal; autoheader; aclocal; automake; autoconf
-
-CC=sgicc CFLAGS="-O0" CXX=sgicc CXXFLAGS="-O0" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
-make
-strip sql/mysqld
-
-
-
-

BUILD/compile-ia64-O2

-make -k clean
-/bin/rm -f */.deps/*.P config.cache
-
-aclocal; autoheader; aclocal; automake; autoconf
-
-CFLAGS="-O2 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
-make
-strip sql/mysqld
-
-
-
-

BUILD/compile-ia64-O2-sgicc

-make -k clean
-/bin/rm -f */.deps/*.P config.cache
-
-aclocal; autoheader; aclocal; automake; autoconf
-
-CC=sgicc CFLAGS="-O2" CXX=sgicc CXXFLAGS="-O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
-make
-strip sql/mysqld
-
-
-
-

BUILD/compile-ia64-O6

-make -k clean
-/bin/rm -f */.deps/*.P config.cache
-
-aclocal; autoheader; aclocal; automake; autoconf
-
-CFLAGS="-O6 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
-make
-strip sql/mysqld

Docs/manual.texi

@@ -2393,7 +2393,7 @@ Apart from the following links, you can find and download a lot of
 Information about the German MySQL mailing list.
 
 @item @uref{http://www2.rent-a-database.de/mysql/}
-@strong{MySQL} manual in German.
+@strong{MySQL} handbook in German.
 
 @item @uref{http://www.bitmover.com:8888//home/bk/mysql}
 Web access to the @strong{MySQL} BitKeeper repository.

innobase/configure.in

@@ -10,7 +10,7 @@ AC_PROG_INSTALL
 AC_CHECK_HEADERS(aio.h sched.h)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_FUNCS(sched_yield)
-AC_C_INLINE
+#AC_C_INLINE  Already checked in MySQL
 AC_C_BIGENDIAN
 
 # Build optimized or debug version ?
@@ -56,10 +56,13 @@ else
 fi
 
 case "$target_os" in
-       hp*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1,
-	                     No inlining because gcc broken on HP-UX);;
-       *sgi-irix*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1,
-	                     No inlining because cc broken on irix);;
+       hp*)
+	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
+       irix*)
+	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
+       sysv5uw7*)
+	 # Problem when linking on SCO
+	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
 esac
 
 AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile

innobase/include/ut0dbg.h

@@ -9,9 +9,9 @@ Created 1/30/1994 Heikki Tuuri
 #ifndef ut0dbg_h
 #define ut0dbg_h
 
+#include "univ.i"
 #include <assert.h>
 #include <stdlib.h>
-#include "univ.i"
 #include "os0thread.h"
 
 extern ulint	ut_dbg_zero; /* This is used to eliminate

innobase/include/ut0mem.h

@@ -9,9 +9,9 @@ Created 5/30/1994 Heikki Tuuri
 #ifndef ut0mem_h
 #define ut0mem_h
 
+#include "univ.i"
 #include <string.h>
 #include <stdlib.h>
-#include "univ.i"
 
 UNIV_INLINE
 void*

innobase/include/ut0ut.h

@@ -9,10 +9,9 @@ Created 1/20/1994 Heikki Tuuri
 #ifndef ut0ut_h
 #define ut0ut_h
 
-#include <time.h>
-#include <ctype.h>
-
 #include "univ.i"
+#include <time.h>
+#include <m_ctype.h>
 
 
 typedef time_t	ib_time_t;

innobase/pars/lexyy.c

@@ -6,6 +6,7 @@
 
 #define FLEX_SCANNER
 
+#include "univ.i"
 #include <stdio.h>
 
 
@@ -5850,7 +5851,6 @@ Created 12/14/1997 Heikki Tuuri
 *******************************************************/
 #define YYSTYPE que_node_t*
 
-#include "univ.i"
 #include "pars0pars.h"
 #include "pars0grm.h"
 #include "pars0sym.h"

innobase/pars/pars0grm.c

@@ -97,9 +97,8 @@ que_node_t */
 #define YYSTYPE que_node_t*
 #define alloca	mem_alloc
 
-#include <math.h>
-
 #include "univ.i"
+#include <math.h>
 #include "pars0pars.h"
 #include "mem0mem.h"
 #include "que0types.h"

innobase/pars/pars0grm.y

@@ -12,9 +12,8 @@ que_node_t */
 #define YYSTYPE que_node_t*
 #define alloca	mem_alloc
 
-#include <math.h>
-
 #include "univ.i"
+#include <math.h>
 #include "pars0pars.h"
 #include "mem0mem.h"
 #include "que0types.h"

mysql-test/r/rpl000014.result

 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	73		
 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	73	Yes			0		0
+127.0.0.1	root	9999	1	master-bin.001	73	Yes			0		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	73	No			0		0
+127.0.0.1	root	9999	1	master-bin.001	73	No			0		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	73	Yes			0		0
+127.0.0.1	root	9999	1	master-bin.001	73	Yes			0		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	173	Yes			0		0
+127.0.0.1	root	9999	1	master-bin.001	173	Yes			0		0
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	73		
 n

mysql-test/r/rpl000015.result

@@ -3,11 +3,11 @@ master-bin.001	73
 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
 		0	0		0	No			0		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	test	3306	60		4	No			0		0
+127.0.0.1	test	9998	60		4	No			0		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	60		4	No			0		0
+127.0.0.1	root	9999	60		4	No			0		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	60	master-bin.001	73	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.001	73	Yes			0		0
 n
 10
 45

mysql-test/r/rpl000016.result

 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	60	master-bin.001	216	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.001	216	Yes			0		0
 s
 Could not break slave
 Tried hard
@@ -10,7 +10,7 @@ master-bin.003
 Log_name
 master-bin.003
 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	60	master-bin.003	184	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.003	184	Yes			0		0
 m
 34
 65
@@ -25,6 +25,6 @@ master-bin.006
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.006	131		
 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	60	master-bin.006	131	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.006	131	Yes			0		0
 count(*)
 100

mysql-test/t/rpl000014.test

@@ -4,14 +4,18 @@ show master status;
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 change master to master_log_pos=73;
 slave stop;
 change master to master_log_pos=73;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 slave start;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 change master to master_log_pos=173;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 connection master;
 show master status;

mysql-test/t/rpl000015.test

@@ -8,12 +8,15 @@ connection slave;
 reset slave;
 show slave status;
 change master to master_host='127.0.0.1';
+--replace_result 3306 9998 9306 9999 3334 9999 3335 9999
 show slave status;
 eval change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=$MASTER_MYPORT;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 slave start;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 connection master;
 drop table if exists t1;

mysql-test/t/rpl000016.test

@@ -22,6 +22,7 @@ insert into t1 values('Could not break slave'),('Tried hard');
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 select * from t1;
 connection master;
@@ -67,6 +68,7 @@ insert into t2 values (65);
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 select * from t2;
 connection master;
@@ -86,6 +88,7 @@ connection slave;
 slave stop;
 slave start;
 sync_with_master;
+--replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 # because of concurrent insert, the table may not be up to date
 # if we do not lock

sql-bench/Results/ATIS-mysql-NT_4.0

-Testing server 'MySQL 3.23.31' at 2001-01-18  0:38:04
+Testing server 'MySQL 3.23.37' at 2001-04-19 13:49:16
 
 ATIS table test
 
 Creating tables
-Time for create_table (28):  0 wallclock secs ( 0.00 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for create_table (28):  0 wallclock secs ( 0.02 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Inserting data
-Time to insert (9768):  5 wallclock secs ( 0.95 usr  1.20 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to insert (9768):  6 wallclock secs ( 0.81 usr  1.27 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Retrieving data
-Time for select_simple_join (500):  3 wallclock secs ( 1.59 usr  0.67 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for select_join (100):  4 wallclock secs ( 1.39 usr  0.55 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for select_key_prefix_join (100): 19 wallclock secs (12.20 usr  4.53 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for select_distinct (800): 17 wallclock secs ( 4.72 usr  1.55 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for select_group (2800): 20 wallclock secs ( 3.14 usr  0.95 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_simple_join (500):  3 wallclock secs ( 1.52 usr  0.66 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_join (100):  4 wallclock secs ( 1.41 usr  0.53 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_key_prefix_join (100): 18 wallclock secs (12.05 usr  4.75 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_distinct (800): 17 wallclock secs ( 4.72 usr  1.78 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_group (2800): 21 wallclock secs ( 3.06 usr  1.28 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Removing tables
 Time to drop_table (28):  0 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Total time: 68 wallclock secs (24.02 usr  9.47 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Total time: 69 wallclock secs (23.58 usr 10.26 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/alter-table-mysql-NT_4.0

-Testing server 'MySQL 3.23.31' at 2001-01-17 23:59:28
+Testing server 'MySQL 3.23.37' at 2001-04-19 13:10:14
 
 Testing of ALTER TABLE
 Testing with 1000 columns and 1000 rows in 20 steps
 Insert data into the table
-Time for insert (1000) 1 wallclock secs ( 0.13 usr  0.17 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for insert (1000) 0 wallclock secs ( 0.13 usr  0.31 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Time for alter_table_add (992): 1225 wallclock secs ( 0.47 usr  0.25 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for alter_table_add (992): 1246 wallclock secs ( 0.52 usr  0.22 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Time for create_index (8): 25 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for create_index (8): 26 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Time for drop_index (8): 25 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for drop_index (8): 27 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Time for alter_table_drop (496): 1039 wallclock secs ( 0.19 usr  0.11 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for alter_table_drop (496): 1043 wallclock secs ( 0.27 usr  0.06 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Total time: 2315 wallclock secs ( 0.78 usr  0.53 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Total time: 2342 wallclock secs ( 0.91 usr  0.59 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/big-tables-mysql-NT_4.0

-Testing server 'MySQL 3.23.31' at 2001-01-18  0:39:12
+Testing server 'MySQL 3.23.37' at 2001-04-19 13:50:25
 
 Testing of some unusual tables
 All tests are done 1000 times with 1000 fields
 
 Testing table with 1000 fields
 Testing select * from table with 1 record
-Time to select_many_fields(1000): 20 wallclock secs ( 8.56 usr  9.42 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to select_many_fields(1000): 19 wallclock secs ( 8.02 usr  9.49 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing select all_fields from table with 1 record
-Time to select_many_fields(1000): 35 wallclock secs ( 9.09 usr  9.48 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to select_many_fields(1000): 35 wallclock secs ( 8.78 usr  8.91 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing insert VALUES()
-Time to insert_many_fields(1000):  4 wallclock secs ( 0.47 usr  0.14 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to insert_many_fields(1000):  3 wallclock secs ( 0.48 usr  0.14 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing insert (all_fields) VALUES()
-Time to insert_many_fields(1000): 18 wallclock secs ( 0.17 usr  0.25 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to insert_many_fields(1000): 19 wallclock secs ( 0.16 usr  0.31 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Total time: 80 wallclock secs (18.31 usr 19.30 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Total time: 79 wallclock secs (17.44 usr 18.84 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/connect-mysql-NT_4.0

-Testing server 'MySQL 3.23.31' at 2001-01-18  0:40:33
+Testing server 'MySQL 3.23.37' at 2001-04-19 13:51:45
 
 Testing the speed of connecting to the server and sending of data
 All tests are done 10000 times
 
 Testing connection/disconnect
-Time to connect (10000): 33 wallclock secs (11.47 usr  9.97 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to connect (10000): 33 wallclock secs (12.13 usr  9.89 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Test connect/simple select/disconnect
-Time for connect+select_simple (10000): 36 wallclock secs (12.84 usr 11.23 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for connect+select_simple (10000): 37 wallclock secs (12.36 usr 12.34 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Test simple select
-Time for select_simple (10000):  4 wallclock secs ( 0.88 usr  1.61 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_simple (10000):  4 wallclock secs ( 0.80 usr  1.48 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing connect/select 1 row from table/disconnect
-Time to connect+select_1_row (10000): 38 wallclock secs (13.19 usr 12.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to connect+select_1_row (10000): 39 wallclock secs (12.91 usr 11.73 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing select 1 row from table
-Time to select_1_row (10000):  5 wallclock secs ( 1.14 usr  1.80 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to select_1_row (10000):  5 wallclock secs ( 1.23 usr  1.69 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing select 2 rows from table
-Time to select_2_rows (10000):  6 wallclock secs ( 0.91 usr  2.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to select_2_rows (10000):  6 wallclock secs ( 1.00 usr  2.20 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Test select with aritmetic (+)
-Time for select_column+column (10000):  6 wallclock secs ( 0.88 usr  1.83 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_column+column (10000):  5 wallclock secs ( 1.08 usr  1.75 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing retrieval of big records (65000 bytes)
-Time to select_big (10000): 55 wallclock secs (19.23 usr  8.98 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to select_big (10000): 50 wallclock secs (17.36 usr  6.95 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Total time: 183 wallclock secs (60.53 usr 49.50 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Total time: 179 wallclock secs (58.89 usr 48.05 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/create-mysql-NT_4.0

-Testing server 'MySQL 3.23.31' at 2001-01-18  0:43:36
+Testing server 'MySQL 3.23.37' at 2001-04-19 13:54:45
 
 Testing the speed of creating and droping tables
 Testing with 10000 tables and 10000 loop count
 
 Testing create of tables
-Time for create_MANY_tables (10000): 245 wallclock secs ( 2.73 usr  1.56 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for create_MANY_tables (10000): 231 wallclock secs ( 3.27 usr  1.58 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Accessing tables
-Time to select_group_when_MANY_tables (10000): 249 wallclock secs ( 1.39 usr  2.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to select_group_when_MANY_tables (10000): 196 wallclock secs ( 1.48 usr  1.77 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing drop
-Time for drop_table_when_MANY_tables (10000): 187 wallclock secs ( 1.08 usr  1.38 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for drop_table_when_MANY_tables (10000): 169 wallclock secs ( 1.41 usr  1.42 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing create+drop
-Time for create+drop (10000): 142 wallclock secs ( 3.30 usr  2.89 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for create_key+drop (10000): 172 wallclock secs ( 5.14 usr  2.92 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Total time: 995 wallclock secs (13.64 usr 10.78 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for create+drop (10000): 134 wallclock secs ( 3.78 usr  2.89 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for create_key+drop (10000): 167 wallclock secs ( 5.98 usr  2.77 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Total time: 897 wallclock secs (15.94 usr 10.42 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/select-mysql-NT_4.0

-Testing server 'MySQL 3.23.31' at 2001-01-18  2:59:37
+Testing server 'MySQL 3.23.37' at 2001-04-19 16:00:44
 
 Testing the speed of selecting on keys that consist of many parts
 The test-table has 10000 rows and the test is done with 500 ranges.
 
 Creating table
 Inserting 10000 rows
-Time to insert (10000):  7 wallclock secs ( 1.30 usr  1.41 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to insert (10000):  7 wallclock secs ( 1.27 usr  1.34 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+
+Test if the database has a query cache
+Time for select_query_cache (10000): 90 wallclock secs ( 5.81 usr  1.91 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+
+Time for select_query_cache2 (10000): 91 wallclock secs ( 5.55 usr  1.86 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing big selects on the table
-Time for select_big (70:17207):  1 wallclock secs ( 0.41 usr  0.09 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for select_range (410:1057904): 187 wallclock secs (27.39 usr  9.33 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for min_max_on_key (70000): 179 wallclock secs (29.25 usr 12.30 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for count_on_key (50000): 346 wallclock secs (21.52 usr  9.14 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_big (70:17207):  1 wallclock secs ( 0.33 usr  0.17 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for select_range (410:1057904): 186 wallclock secs (27.06 usr  9.17 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for min_max_on_key (70000): 182 wallclock secs (31.70 usr 12.77 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_on_key (50000): 368 wallclock secs (22.81 usr  8.23 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Time for count_group_on_key_parts (1000:100000): 41 wallclock secs ( 2.81 usr  0.92 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_group_on_key_parts (1000:100000): 40 wallclock secs ( 2.73 usr  0.83 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 Testing count(distinct) on the table
-Time for count_distinct (2000:2000): 80 wallclock secs ( 0.94 usr  0.31 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for count_distinct_group_on_key (1000:6000): 45 wallclock secs ( 0.67 usr  0.25 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for count_distinct_group_on_key_parts (1000:100000): 150 wallclock secs ( 3.31 usr  0.97 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for count_distinct_group (1000:100000): 150 wallclock secs ( 3.03 usr  1.20 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Time for count_distinct_big (100:1000000): 111 wallclock secs (23.03 usr  7.88 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
-Total time: 1297 wallclock secs (113.66 usr 43.80 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_distinct_key_prefix (1000:1000): 39 wallclock secs ( 0.52 usr  0.17 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_distinct (1000:1000): 48 wallclock secs ( 0.56 usr  0.20 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_distinct_2 (1000:1000): 52 wallclock secs ( 0.45 usr  0.27 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_distinct_group_on_key (1000:6000): 48 wallclock secs ( 0.58 usr  0.17 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_distinct_group_on_key_parts (1000:100000): 145 wallclock secs ( 3.02 usr  0.94 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_distinct_group (1000:100000): 145 wallclock secs ( 2.67 usr  1.19 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for count_distinct_big (100:1000000): 114 wallclock secs (22.47 usr  8.11 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Total time: 1556 wallclock secs (127.53 usr 47.33 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/wisconsin-mysql-NT_4.0

-Testing server 'MySQL 3.23.31' at 2001-01-18  3:21:15
+Testing server 'MySQL 3.23.37' at 2001-04-19 16:26:40
 
 Wisconsin benchmark test
 
-Time for create_table (3):  0 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for create_table (3):  0 wallclock secs ( 0.00 usr  0.02 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Inserting data
-Time to insert (31000): 19 wallclock secs ( 2.50 usr  3.77 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time to insert (31000): 19 wallclock secs ( 2.17 usr  4.23 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 Time to delete_big (1):  0 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Running actual benchmark
-Time for wisc_benchmark (114):  9 wallclock secs ( 5.44 usr  1.66 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for wisc_benchmark (114):  9 wallclock secs ( 5.77 usr  1.45 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
-Total time: 28 wallclock secs ( 7.94 usr  5.42 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Total time: 28 wallclock secs ( 7.95 usr  5.70 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql/slave.cc

@@ -1191,7 +1191,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
   pthread_cond_broadcast(&COND_slave_start);
   pthread_mutex_unlock(&LOCK_slave);
   
-  int error = 1;
+  // int error = 1;
   bool retried_once = 0;
   ulonglong last_failed_pos = 0;
   
@@ -1369,7 +1369,7 @@ the slave thread with \"mysqladmin start-slave\". We stopped at log \
 	}
     }
 
-  error = 0;
+  // error = 0;
  err:
   // print the current replication position 
   sql_print_error("Slave thread exiting, replication stopped in log '%s' at \