bk commit into 5.0 tree (istruewing:1.2272)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-18 21:05:21+02:00, istruewing@stripped +4 -0
  Merge chilla.local:/home/mydev/mysql-5.0--team
  into  chilla.local:/home/mydev/mysql-5.0-ateam
  MERGE: 1.2196.34.13

  mysql-test/r/myisam.result@stripped, 2006-09-18 21:05:15+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.79.1.1

  mysql-test/t/myisam.test@stripped, 2006-09-18 21:05:15+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.61.1.1

  sql/handler.cc@stripped, 2006-09-18 21:05:15+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.215.1.1

  sql/opt_range.cc@stripped, 2006-09-18 21:05:15+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.217.1.1

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-ateam/RESYNC

--- 1.217/sql/handler.cc	2006-09-18 21:05:27 +02:00
+++ 1.218/sql/handler.cc	2006-09-18 21:05:27 +02:00
@@ -1374,6 +1374,15 @@ int ha_delete_table(THD *thd, enum db_ty
 /****************************************************************************
 ** General handler functions
 ****************************************************************************/
+handler *handler::clone(MEM_ROOT *mem_root)
+{
+  handler *new_handler= get_new_handler(table, mem_root, table->s->db_type);
+  if (new_handler && !new_handler->ha_open(table->s->path, table->db_stat,
+                                           HA_OPEN_IGNORE_IF_LOCKED))
+    return new_handler;
+  return NULL;
+}
+
 
 	/* Open database-handler. Try O_RDONLY if can't open as O_RDWR */
 	/* Don't wait for locks if not HA_OPEN_WAIT_IF_LOCKED is set */

--- 1.223/sql/opt_range.cc	2006-09-18 21:05:27 +02:00
+++ 1.224/sql/opt_range.cc	2006-09-18 21:05:27 +02:00
@@ -1034,10 +1034,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_
   }
 
   THD *thd= current_thd;
-  if (!(file= get_new_handler(head, thd->mem_root, head->s->db_type)))
-    goto failure;
-  DBUG_PRINT("info", ("Allocated new handler %p", file));
-  if (file->ha_open(head->s->path, head->db_stat, HA_OPEN_IGNORE_IF_LOCKED))
+  if (!(file= head->file->clone(thd->mem_root)))
   {
     /* Caller will free the memory */
     goto failure;