fixed MyISAM crash on dynamic-row tables with huge number of to-be-packed fields

ebd9fced · serg@serg.mysql.com · 578ce24e · ebd9fced · ebd9fced
Commit ebd9fced authored Oct 28, 2002 by serg@serg.mysql.com
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 173 additions and 1 deletion

myisam/mi_open.c myisam/mi_open.c +2 -1

mysql-test/t/myisam.test mysql-test/t/myisam.test +171 -0

No files found.
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -495,7 +495,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
    extra=ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER)+MI_SPLIT_LENGTH+
      MI_DYN_DELETE_BLOCK_HEADER;
-  tmp_length=max(share->base.pack_reclength,share->base.max_key_length);
+  tmp_length=max(share->base.pack_reclength+share->base.pack_bits,
+                 share->base.max_key_length);
  info.alloced_rec_buff_length=tmp_length;
  if (!(info.rec_alloc=(byte*) my_malloc(tmp_length+extra+8,
 					 MYF(MY_WME | MY_ZEROFILL))))

--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test