bk commit into 4.0 tree (serg:1.1980)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1980 04/08/22 12:43:26 serg@stripped +1 -0
  after merge fixes

  myisammrg/myrg_open.c
    1.24 04/08/22 12:43:20 serg@stripped +7 -3
    after merge fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.0

--- 1.23/myisammrg/myrg_open.c	Sun Aug 22 10:22:57 2004
+++ 1.24/myisammrg/myrg_open.c	Sun Aug 22 12:43:20 2004
@@ -43,6 +43,7 @@
   DBUG_ENTER("myrg_open");
 
   LINT_INIT(m_info);
+  m_info=0;
   isam=0;
   errpos=files=0;
   bzero((char*) &file,sizeof(file));
@@ -75,7 +76,7 @@
       if( !strncmp(buff+1,"INSERT_METHOD=",14))
       {			/* Lookup insert method */
 	int tmp=find_type(buff+15,&merge_insert_method,2);
-	m_info.merge_insert_method = (uint) (tmp >= 0 ? tmp : 0);
+	m_info->merge_insert_method = (uint) (tmp >= 0 ? tmp : 0);
       }
       continue;		/* Skip comments */
     }
@@ -115,7 +116,7 @@
     m_info->open_tables[files].file_offset=(my_off_t) file_offset;
     file_offset+=isam->state->data_file_length;
     files++;
-    if (m_info.reclength != isam->s->base.reclength)
+    if (m_info->reclength != isam->s->base.reclength)
     {
       my_errno=HA_ERR_WRONG_MRG_TABLE_DEF;
       goto err;
@@ -128,6 +129,9 @@
       m_info->rec_per_key_part[i]+=isam->s->state.rec_per_key_part[i] / m_info->tables;
   }
 
+  if (!m_info && !(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO),
+                                           MYF(MY_WME|MY_ZEROFILL))))
+    goto err;
   /* Don't mark table readonly, for ALTER TABLE ... UNION=(...) to work */
   m_info->options&= ~(HA_OPTION_COMPRESS_RECORD | HA_OPTION_READ_ONLY_DATA);
 
@@ -136,7 +140,7 @@
     my_errno=HA_ERR_RECORD_FILE_FULL;
     goto err;
   }
-  m_info->keys=(files) ? m_info->open_tables->table->s->base.keys : 0;
+  m_info->keys= files ? isam->s->base.keys : 0;
   bzero((char*) &m_info->by_key,sizeof(m_info->by_key));
 
   /* this works ok if the table list is empty */