Merge bk-internal.mysql.com:/home/bk/mysql-3.23

into narttu.mysql.fi:/my/mysql-3.23

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;

myisam/mi_dynrec.c

@@ -62,7 +62,7 @@ int _mi_write_blob_record(MI_INFO *info, const byte *record)
 
   extra=ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER)+MI_SPLIT_LENGTH+
     MI_DYN_DELETE_BLOCK_HEADER+1;
-  reclength= (info->s->base.pack_reclength+ info->s->base.pack_bits+
+  reclength= (info->s->base.pack_reclength+
 	      _my_calc_total_blob_length(info,record)+ extra);
   if (reclength > MI_DYN_MAX_ROW_LENGTH)
   {

myisam/mi_open.c

@@ -602,6 +602,8 @@ void mi_setup_functions(register MYISAM_SHARE *share)
     share->compare_unique=_mi_cmp_dynamic_unique;
     share->calc_checksum= mi_checksum;
 
+    /* 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=_mi_update_blob_record;

mysql-test/r/isam.result

@@ -8,3 +8,5 @@ Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK