Merge

BitKeeper/etc/gone:
  auto-merge
BitKeeper/etc/ignore:
  merged, cleaned up

BitKeeper/etc/gone

+mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305
+mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5
 mwagner@evoq.home.mwagner.org|mysql-test/var/lib/README|20001009213643|15351|3b652c0f321e1940
 mwagner@evoq.home.mwagner.org|mysql-test/var/log/README|20001009213643|16203|df5481fdbe6e5b6e
 mwagner@evoq.home.mwagner.org|mysql-test/var/run/README|20001009213643|17062|acb305e4c2ed5990
 mwagner@evoq.home.mwagner.org|mysql-test/var/tmp/README|20001009213643|17904|b32d866bfd50e72e
-mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5
-mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305
 sasha@mysql.sashanet.com|mysql-test/t/include/master-slave.inc|20001118030458|01636|556fd038c3a3d54

myisammrg/myrg_extra.c

@@ -40,19 +40,9 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function)
       info->current_table=0;
       info->last_used_table=info->open_tables;
     }
-
-    info->records=info->del=info->data_file_length=0;
     for (file=info->open_tables ; file != info->end_table ; file++)
-    {
       if ((error=mi_extra(file->table,function)))
 	save_error=error;
-      file->file_offset=info->data_file_length;
-      info->data_file_length+=file->table->s->state.state.data_file_length;
-      info->records+=file->table->s->state.state.records;
-      info->del+=file->table->s->state.state.del;
-      DBUG_PRINT("info2",("table: %s, offset: 0x%08lx",
-                  file->table->filename,(ulong)file->file_offset));
-    }
   }
   DBUG_RETURN(save_error);
 }

myisammrg/myrg_info.c

@@ -43,17 +43,27 @@ int myrg_status(MYRG_INFO *info,register MYMERGE_INFO *x,int flag)
       (ulong) -1L;
   if (flag != HA_STATUS_POS)
   {
+    MYRG_TABLE *file;
+
+    info->records=info->del=info->data_file_length=0;
+    for (file=info->open_tables ; file != info->end_table ; file++)
+    {
+      file->file_offset=info->data_file_length;
+      info->data_file_length+=file->table->s->state.state.data_file_length;
+      info->records+=file->table->s->state.state.records;
+      info->del+=file->table->s->state.state.del;
+      DBUG_PRINT("info2",("table: %s, offset: 0x%08lx",
+                  file->table->filename,(ulong)file->file_offset));
+    }
     x->records	 = info->records;
     x->deleted	 = info->del;
     x->data_file_length = info->data_file_length;
     x->reclength  = info->reclength;
+    x->options	 = info->options;
     if (current_table)
       x->errkey  = current_table->table->errkey;
     else
-    {						/* No tables in MRG */
       x->errkey=0;
   }
-    x->options	 = info->options;
-  }
   DBUG_RETURN(0);
 }

sql/sql_base.cc

@@ -740,7 +740,6 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
     }
     table->prev->next=table->next;		/* Remove from unused list */
     table->next->prev=table->prev;
-    table->file->reset();
   }
   else
   {