merge with 4.0.15

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-database.c~af098622e818ce0d:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
SSL/cacert.pem:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
SSL/client-cert.pem:
  Auto merged
SSL/client-key.pem:
  Auto merged
SSL/server-cert.pem:
  Auto merged
SSL/server-key.pem:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisamlog/myisamlog.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
  Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/m_string.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
isam/_search.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/openssl_1.result:
  Auto merged
mysql-test/r/packet.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select_safe.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/lock_tables_lost_commit-master.opt:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_uniq.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
vio/Makefile.am:
  Auto merged
vio/vio.c:
  Auto merged
mysql-test/t/myisam.test:
  merge with 4.0.15
  Extra tests
mysys/mf_keycache.c:
  Keep local file

1 files changed, 77 insertions, 23 deletions

diff --git a/sql-bench/limits/mysql.cfg b/sql-bench/limits/mysql.cfg
index cebb85d8dfd..feaa79e43e9 100644
--- a/sql-bench/limits/mysql.cfg
+++ b/sql-bench/limits/mysql.cfg
@@ -177,7 +177,7 @@ compute=no				# Compute
    ###> execute error:You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'compute sum(a) by a' at line 1
    ###
    ###As far as some queries didnt return OK, result is NO
-connections=99				# Simultaneous connections (installation default)
+connections=101				# Simultaneous connections (installation default)
 constraint_check=syntax only		# Column constraints
    ###< create table crash_q (a int check (a>0))
    ###> OK
@@ -345,7 +345,7 @@ date_format_inresult=iso		# Date format in result
    ###> OK
    ###
    ###< select a from crash_me_d
-   ###> 2003-03-26
+   ###> 2003-08-27
    ###< delete from crash_me_d
    ###> OK
 date_infinity=error			# Supports 'infinity dates
@@ -695,7 +695,7 @@ func_extra_elt=yes			# Function ELT
 func_extra_encrypt=yes			# Function ENCRYPT
    ###
    ###<select encrypt('hello') 
-   ###>tJNum3fO44bOE
+   ###>tHrzZO8Aq1FG6
 func_extra_expand2arg=no		# Function EXPAND
    ###
    ###<select expand('abcd',6) 
@@ -991,7 +991,7 @@ func_extra_subtime=no			# Function SUBTIME
 func_extra_sysdate=yes			# Function SYSDATE
    ###
    ###<select sysdate() 
-   ###>2003-03-26 13:44:57
+   ###>2003-08-27 19:55:21
 func_extra_tail=no			# Function TAIL
    ###
    ###<select tail('ABCDEFG',3) 
@@ -1056,7 +1056,7 @@ func_extra_uid=no			# Function UID
 func_extra_unix_timestamp=yes		# Function UNIX_TIMESTAMP
    ###
    ###<select unix_timestamp() 
-   ###>1048679097
+   ###>1062003321
 func_extra_userenv=no			# Function USERENV
    ###
    ###<select userenv 
@@ -1068,7 +1068,7 @@ func_extra_value=no			# Function VALUE
 func_extra_version=yes			# Function VERSION
    ###
    ###<select version() 
-   ###>4.0.12-debug
+   ###>4.0.15-debug-log
 func_extra_weekday=yes			# Function WEEKDAY
    ###
    ###<select weekday('1997-11-29') from crash_me_d
@@ -1136,11 +1136,11 @@ func_odbc_cot=yes			# Function COT
 func_odbc_curdate=yes			# Function CURDATE
    ###
    ###<select curdate() 
-   ###>2003-03-26
+   ###>2003-08-27
 func_odbc_curtime=yes			# Function CURTIME
    ###
    ###<select curtime() 
-   ###>13:44:57
+   ###>19:55:21
 func_odbc_database=yes			# Function DATABASE
    ###
    ###<select database() 
@@ -1269,7 +1269,7 @@ func_odbc_monthname=yes			# Function MONTHNAME
 func_odbc_now=yes			# Function NOW
    ###
    ###<select now() 
-   ###>2003-03-26 13:44:57
+   ###>2003-08-27 19:55:21
 func_odbc_pi=yes			# Function PI
    ###
    ###<select pi() 
@@ -1416,15 +1416,15 @@ func_sql_concat_as_||=error		# Function concatenation with ||
 func_sql_current_date=yes		# Function CURRENT_DATE
    ###
    ###<select current_date 
-   ###>2003-03-26
+   ###>2003-08-27
 func_sql_current_time=yes		# Function CURRENT_TIME
    ###
    ###<select current_time 
-   ###>13:44:57
+   ###>19:55:21
 func_sql_current_timestamp=yes		# Function CURRENT_TIMESTAMP
    ###
    ###<select current_timestamp 
-   ###>2003-03-26 13:44:57
+   ###>2003-08-27 19:55:21
 func_sql_current_user=with_parenthesis	# CURRENT_USER
    ###< select CURRENT_USER 
    ###> execute error:Unknown column 'CURRENT_USER' in 'field list'
@@ -1438,11 +1438,11 @@ func_sql_extract_sql=yes		# Function EXTRACT
 func_sql_localtime=yes			# Function LOCALTIME
    ###
    ###<select localtime 
-   ###>2003-03-26 13:44:57
+   ###>2003-08-27 19:55:21
 func_sql_localtimestamp=yes		# Function LOCALTIMESTAMP
    ###
    ###<select localtimestamp 
-   ###>2003-03-26 13:44:57
+   ###>2003-08-27 19:55:21
 func_sql_lower=yes			# Function LOWER
    ###
    ###<select LOWER('ABC') 
@@ -1846,6 +1846,16 @@ left_outer_join_using=yes		# left outer join using
    ###> OK
    ###
    ###As far as all queries returned OK, result is YES
+length_of_varchar_field=actual length	# CHARACTER_LENGTH(varchar_field)
+   ###< CREATE TABLE crash_me1 (S1 VARCHAR(100))
+   ###> OK
+   ###< INSERT INTO crash_me1 VALUES ('X')
+   ###> OK
+   ###
+   ###< SELECT CHARACTER_LENGTH(S1) FROM crash_me1
+   ### > 1
+   ###< drop table crash_me1 
+   ###> OK
 like_with_column=yes			# column LIKE column
    ###< create table crash_q (a char(10),b char(10))
    ###> OK
@@ -1880,7 +1890,7 @@ logical_value=1				# Value of logical operation (1=1)
    ###>1
 max_big_expressions=10			# big expressions
    ###We are trying (example with N=5):
-   ###select 0+(1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+...(16398)
+   ###select 0+(1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+...(14308)
    ### 50:FAIL 10:OK 30:FAIL 14:FAIL 11:FAIL
 max_char_size=255			# max char() size
    ###We are trying (example with N=5):
@@ -1902,10 +1912,10 @@ max_conditions=85660			# OR and AND in WHERE
    ###We are trying (example with N=5):
    ###select a from crash_me where a=1 and b='a'  or a=0 and b='0' or a=1 and b='1' or a=2 and b='2' or a=3 and b='3' or a=4 and b='4'
    ### 27592:OK 41389:OK 48287:FAIL 42769:OK 45528:FAIL 43321:FAIL 42880:FAIL 42791:OK 42835:FAIL 42800:OK 42817:OK 42826:OK 42830:OK 42832:FAIL 42831:FAIL
-max_expressions=1659			# simple expressions
+max_expressions=1450			# simple expressions
    ###We are trying (example with N=5):
    ###select 1+1+1+1+1+1
-   ### 5000:FAIL 1000:OK 3000:FAIL 1400:OK 2200:FAIL 1560:OK 1880:FAIL 1624:OK 1752:FAIL 1650:OK 1701:FAIL 1660:FAIL 1652:OK 1656:OK 1658:OK 1659:OK
+   ### 5000:FAIL 1000:OK 3000:FAIL 1400:OK 2200:FAIL 1560:FAIL 1432:OK 1496:FAIL 1445:OK 1470:FAIL 1450:OK 1460:FAIL 1452:FAIL 1451:FAIL
 max_index=32				# max index
    ### max_unique_index=32 ,so max_index must be same
 max_index_length=500			# index length
@@ -1946,10 +1956,10 @@ max_row_length_with_null=65502		# table row length with nulls (without blobs)
 max_select_alias_name=+512		# select alias name length
    ###We are trying (example with N=5):
    ###select b as aaaaa from crash_me
-max_stack_expression=1659		# stacked expressions
+max_stack_expression=1450		# stacked expressions
    ###We are trying (example with N=5):
    ###select 1+(1+(1+(1+(1+(1)))))
-   ### 1000:OK 1500:OK 1750:FAIL 1550:OK 1650:OK 1700:FAIL 1660:FAIL 1652:OK 1656:OK 1658:OK 1659:OK
+   ### 1000:OK 1500:FAIL 1100:OK 1300:OK 1400:OK 1450:OK 1475:FAIL 1455:FAIL 1451:FAIL
 max_table_alias_name=+512		# table alias name length
    ###We are trying (example with N=5):
    ###select aaaaa.b from crash_me aaaaa
@@ -2119,7 +2129,7 @@ odbc_left_outer_join=yes		# left outer join odbc style
    ###> OK
    ###
    ###As far as all queries returned OK, result is YES
-operating_system=Linux 2.4.18-my-4GB i686	# crash-me tested on
+operating_system=Linux 2.4.20-64GB-SMP i686	# crash-me tested on
 order_by=yes				# Order by
    ###< select a from crash_me order by a
    ###> OK
@@ -3696,7 +3706,7 @@ reserved_word_ansi-92/99_section=no	# Keyword SECTION
    ###As far as all queries returned OK, result is NO
 reserved_word_ansi-92/99_select=yes	# Keyword SELECT
    ###< create table crash_me10 (SELECT int not null)
-   ###> execute error:You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT int not null)' at line 1
+   ###> execute error:You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'int not null)' at line 1
    ###< drop table crash_me10 
    ###> execute error:Unknown table 'crash_me10'
    ###
@@ -6043,12 +6053,56 @@ select_without_from=yes			# SELECT without FROM
    ###> OK
    ###
    ###As far as all queries returned OK, result is YES
-server_version=MySQL 4.0.12 debug/	# server version
+server_version=MySQL 4.0.15 debug log/	# server version
 simple_joins=yes			# ANSI SQL simple joins
    ###< select crash_me.a from crash_me, crash_me t0
    ###> OK
    ###
    ###As far as all queries returned OK, result is YES
+sorted_group_by=yes			# Group by always sorted
+   ###< create table crash_me_t1 (a int not null, b int not null)
+   ###> OK
+   ###< insert into crash_me_t1 values (1,1)
+   ###> OK
+   ###< insert into crash_me_t1 values (1,2)
+   ###> OK
+   ###< insert into crash_me_t1 values (3,1)
+   ###> OK
+   ###< insert into crash_me_t1 values (3,2)
+   ###> OK
+   ###< insert into crash_me_t1 values (2,2)
+   ###> OK
+   ###< insert into crash_me_t1 values (2,1)
+   ###> OK
+   ###< create table crash_me_t2 (a int not null, b int not null)
+   ###> OK
+   ###< create index crash_me_t2_ind on crash_me_t2 (a)
+   ###> OK
+   ###< insert into crash_me_t2 values (1,3)
+   ###> OK
+   ###< insert into crash_me_t2 values (3,1)
+   ###> OK
+   ###< insert into crash_me_t2 values (2,2)
+   ###> OK
+   ###< insert into crash_me_t2 values (1,1)
+   ###> OK
+   ###
+   ###< select crash_me_t1.a,crash_me_t2.b from crash_me_t1,crash_me_t2 where crash_me_t1.a=crash_me_t2.a group by crash_me_t1.a,crash_me_t2.b
+   ### > 1,1
+   ### > 1,3
+   ### > 2,2
+   ### > 3,1
+   ###
+   ### Check recordset:
+   ### 1,1 expected: 1,1
+   ### 1,3 expected: 1,3
+   ### 2,2 expected: 2,2
+   ### 3,1 expected: 3,1
+   ### Recordset corresponds with template
+   ###< drop table crash_me_t1
+   ###> OK
+   ###< drop table crash_me_t2
+   ###> OK
 storage_of_float=round			# Storage of float values
    ###< create table crash_q (q1 float(4,1))
    ###> OK
@@ -6166,7 +6220,7 @@ time_format_inresult=iso		# Time format in result
    ###> OK
    ###
    ###< select a from crash_me_t
-   ###> 13:44:57
+   ###> 19:55:21
    ###< delete from crash_me_t
    ###> OK
 transactions=yes			# transactions