merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/open.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.cc:
  Merge
sql/sql_acl.cc:
  Merge and code cleanup of acl_getroot()

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 824fbe804ee..be62fd86192 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