From: Date: August 21 2004 6:48pm
Subject: bk commit into 3.23 tree (1.1445)
List-Archive: http://lists.mysql.com/internals/16168
Message-Id: <E1ByZ2p-0002LA-00@chilla.local>

Below is the list of changes that have just been committed into a local
3.23 repository of mydev. When mydev 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.1445 04/08/21 18:48:43 ingo@stripped +1 -0
  bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.
  Abandoned improper use of MyISAM data.

  myisammrg/myrg_open.c
    1.15 04/08/21 18:45:14 ingo@stripped +47 -37
    bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.
    Abandoned improper use of MyISAM data.

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-3.23-3000

--- 1.14/myisammrg/myrg_open.c	Thu Aug 30 10:20:28 2001
+++ 1.15/myisammrg/myrg_open.c	Sat Aug 21 18:45:14 2004
@@ -42,23 +42,47 @@
   MYRG_INFO info,*m_info;
   File fd;
   IO_CACHE file;
-  MI_INFO *isam,*last_isam;
+  MI_INFO *isam;
   DBUG_ENTER("myrg_open");
 
-  LINT_INIT(last_isam);
   LINT_INIT(m_info);
   isam=0;
   errpos=files=0;
   bzero((gptr) &info,sizeof(info));
   bzero((char*) &file,sizeof(file));
   if ((fd=my_open(fn_format(name_buff,name,"",MYRG_NAME_EXT,4),
-		  O_RDONLY | O_SHARE,MYF(0))) < 0 ||
-      init_io_cache(&file, fd, IO_SIZE, READ_CACHE, 0, 0,
-		    MYF(MY_WME | MY_NABP)))
+		  O_RDONLY | O_SHARE,MYF(0))) < 0)
     goto err;
   errpos=1;
+  if (init_io_cache(&file, fd, 4*IO_SIZE, READ_CACHE, 0, 0,
+		    MYF(MY_WME | MY_NABP)))
+    goto err;
+  errpos=2;
   dir_length=dirname_part(name_buff,name);
-  info.reclength=0;
+  while ((length=my_b_gets(&file,buff,FN_REFLEN-1)))
+  {
+    if ((end=buff+length)[-1] == '\n')
+      end[-1]='\0';
+    if (buff[0] && buff[0] != '#')	/* Skipp empty lines and comments */
+    {
+      files++;
+    }
+  }
+
+  if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+
+				       files*sizeof(MYRG_TABLE),
+				       MYF(MY_WME))))
+    goto err;
+  errpos=3;
+  *m_info=info;
+  m_info->open_tables=(files) ? (MYRG_TABLE *) (m_info+1) : 0;
+  m_info->tables=files;
+  for (i= 0; i < files; i++)
+    m_info->open_tables[i].table= 0;
+
+  my_b_seek(&file, 0);
+  m_info->reclength=0;
+  i= 0;
   while ((length=my_b_gets(&file,buff,FN_REFLEN-1)))
   {
     if ((end=buff+length)[-1] == '\n')
@@ -73,35 +97,20 @@
       }
       if (!(isam=mi_open(buff,mode,test(handle_locking))))
 	goto err;
-      files++;
-      last_isam=isam;
-      if (info.reclength && info.reclength != isam->s->base.reclength)
+      if (m_info->reclength && (m_info->reclength != isam->s->base.reclength))
       {
 	my_errno=HA_ERR_WRONG_IN_RECORD;
 	goto err;
       }
-      info.reclength=isam->s->base.reclength;
+      m_info->reclength=isam->s->base.reclength;
+      m_info->open_tables[i++].table= isam;
+      m_info->options|= isam->s->options;
+      m_info->records+= isam->state->records;
+      m_info->del+= isam->state->del;
+      m_info->data_file_length+= isam->state->data_file_length;
     }
   }
-  if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+
-				       files*sizeof(MYRG_TABLE),
-				       MYF(MY_WME))))
-    goto err;
-  *m_info=info;
-  m_info->open_tables=(files) ? (MYRG_TABLE *) (m_info+1) : 0;
-  m_info->tables=files;
-  errpos=2;
 
-  for (i=files ; i-- > 0 ; )
-  {
-    m_info->open_tables[i].table=isam;
-    m_info->options|=isam->s->options;
-    m_info->records+=isam->state->records;
-    m_info->del+=isam->state->del;
-    m_info->data_file_length+=isam->state->data_file_length;
-    if (i)
-      isam=(MI_INFO*) (isam->open_list.next->data);
-  }
   /* Fix fileinfo for easyer debugging (actually set by rrnd) */
   file_offset=0;
   for (i=0 ; (uint) i < files ; i++)
@@ -132,19 +141,20 @@
 err:
   save_errno=my_errno;
   switch (errpos) {
-  case 2:
+  case 3:
+    for (i= 0; i < files; i++)
+    {
+      isam= m_info->open_tables[i].table;
+      if (isam)
+        mi_close(isam);
+    }
     my_free((char*) m_info,MYF(0));
     /* Fall through */
+  case 2:
+    end_io_cache(&file);
+    /* Fall through */
   case 1:
     VOID(my_close(fd,MYF(0)));
-    end_io_cache(&file);
-    for (i=files ; i-- > 0 ; )
-    {
-      isam=last_isam;
-      if (i)
-	last_isam=(MI_INFO*) (isam->open_list.next->data);
-      mi_close(isam);
-    }
   }
   my_errno=save_errno;
   DBUG_RETURN (NULL);