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

3 files changed, 21 insertions, 355 deletions

diff --git a/isam/_search.c b/isam/_search.c
index 1ceeab1e824..7b61abfb46b 100644
--- a/isam/_search.c
+++ b/isam/_search.c
@@ -119,7 +119,7 @@ int _nisam_search(register N_INFO *info, register N_KEYDEF *keyinfo, uchar *key,
   {
     keypos=_nisam_get_last_key(info,keyinfo,buff,lastkey,keypos);
     if (!(nextflag & SEARCH_SMALLER) &&
-	_nisam_key_cmp(keyinfo->seg, info->lastkey, key, key_len, SEARCH_FIND))
+	_nisam_key_cmp(keyinfo->seg, lastkey, key, key_len, SEARCH_FIND))
     {
       my_errno=HA_ERR_KEY_NOT_FOUND;			/* Didn't find key */
       goto err;
diff --git a/isam/open.c b/isam/open.c
index 48fab27cac1..9dc27981507 100644
--- a/isam/open.c
+++ b/isam/open.c
@@ -415,6 +415,9 @@ static void setup_functions(register ISAM_SHARE *share)
     share->read_rnd=_nisam_read_rnd_dynamic_record;
     share->delete_record=_nisam_delete_dynamic_record;
     share->compare_record=_nisam_cmp_dynamic_record;
+
+    /* add bits used to pack data to pack_reclength for faster allocation */
+    share->base.pack_reclength+= share->base.pack_bits;
     if (share->base.blobs)
     {
       share->update_record=_nisam_update_blob_record;
diff --git a/isam/test_all.res b/isam/test_all.res
index f6280dd9f98..5de37e44585 100644
--- a/isam/test_all.res
+++ b/isam/test_all.res
@@ -1,367 +1,30 @@
+echo "test2 -L -K -W -P"
 test2 -L -K -W -P
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
-Key cacheing used
-Write cacheing used
-Locking used
+echo "test2 -L -K -W -P -A"
 test2 -L -K -W -P -A
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
-Key cacheing used
-Write cacheing used
-Asyncron io with locking used
+echo "test2 -L -K -W -P -S -R1 -m500"
 test2 -L -K -W -P -S -R1 -m500
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 475
-Update records: 44
-Same-key-read: 4
-Delete records: 475
-Record pointer size: 1
-Key cacheing used
-Write cacheing used
-Locking used
-test2 -L -K -R1 -m2000 ; Should give error 135
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Read first - delete - next -> last
-- Read last - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 1647
-Update records: 125
-Same-key-read: 8
-Delete records: 1647
-Record pointer size: 1
-Key cacheing used
-Locking used
+echo "test2 -L -K -R1 -m2000 ; Should give error 135"
+test2 -L -K -R1 -m2000
+echo "test2 -L -K -P -S -R3 -m50 -b1000000"
 test2 -L -K -P -S -R3 -m50 -b1000000
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 50
-Update records: 5
-Same-key-read: 2
-Delete records: 50
-Record pointer size: 3
-Key cacheing used
-Locking used
+echo "test2 -L -B"
 test2 -L -B
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 903
-Update records: 86
-Same-key-read: 5
-Delete records: 903
-Locking used
-blobs used
+echo "test2 -L -K -W -P -m50 -l"
 test2 -L -K -W -P -m50 -l
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 50
-Update records: 5
-Same-key-read: 2
-Delete records: 50
-Key cacheing used
-Write cacheing used
-Locking used
-Commands   Used count    Errors   Recover errors
-open               14         0                0
-write             700         0                0
-update             70         0                0
-delete            700         0                0
-close              14         0                0
-extra              84         0                0
-Total            1582         0                0
+isamlog
+echo "test2 -L -K -W -P -m50 -l -b100"
 test2 -L -K -W -P -m50 -l -b100
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 50
-Update records: 5
-Same-key-read: 2
-Delete records: 50
-Key cacheing used
-Write cacheing used
-Locking used
-Commands   Used count    Errors   Recover errors
-open               15         0                0
-write             750         0                0
-update             75         0                0
-delete            750         0                0
-close              15         0                0
-extra              90         0                0
-Total            1695         0                0
+isamlog
+echo "time test2"
 time test2
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
+echo "time test2 -K"
 time test2 -K
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
-Key cacheing used
+echo "time test2 -L"
 time test2 -L
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
-Locking used
+echo "time test2 -L -K"
 time test2 -L -K
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
-Key cacheing used
-Locking used
+echo "time test2 -L -K -W"
 time test2 -L -K -W
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
-Key cacheing used
-Write cacheing used
-Locking used
+echo "time test2 -L -K -W -S"
 time test2 -L -K -W -S
-- Creating isam-file
-- Writing key:s
-- Delete
-- Update
-- Same key: first - next -> last - prev -> first
-- All keys: first - next -> last - prev -> first
-- Test if: Read first - next - prev - prev - next == first
-- Test if: Read last - prev - next - next - prev == last
-- Test read key-part
-- Read key (first) - next - delete - next -> last
-- Read last of key - prev - delete - prev -> first
-- Test if: Read rrnd - same
-- Test nisam_records_in_range
-- nisam_info
-- nisam_extra(CACHE) + nisam_rrnd.... + nisam_extra(NO_CACHE)
-- Removing keys
-
-Following test have been made:
-Write records: 907
-Update records: 87
-Same-key-read: 6
-Delete records: 907
-Key cacheing used
-Write cacheing used
-Locking used