bk commit into 5.0 tree (svoj:1.2254)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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-12 18:53:51+05:00, svoj@april.(none) +3 -0
  Merge april.(none):/home/svoj/devel/bk/mysql-5.0-engines
  into  april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-push
  MERGE: 1.2196.34.12

  sql/ha_myisam.cc@stripped, 2006-09-12 18:53:39+05:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.166.1.1

  sql/handler.cc@stripped, 2006-09-12 18:53:40+05:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.215.1.1

  sql/handler.h@stripped, 2006-09-12 18:53:40+05:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.177.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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG20256/mysql-5.0-push/RESYNC

--- 1.167/sql/ha_myisam.cc	2006-09-12 18:54:03 +05:00
+++ 1.168/sql/ha_myisam.cc	2006-09-12 18:54:03 +05:00
@@ -169,6 +169,14 @@
   can_enable_indexes(1)
 {}
 
+handler *ha_myisam::clone(MEM_ROOT *mem_root)
+{
+  ha_myisam *new_handler= static_cast <ha_myisam *>(handler::clone(mem_root));
+  if (new_handler)
+    new_handler->file->state= file->state;
+  return new_handler;
+}
+
 
 static const char *ha_myisam_exts[] = {
   ".MYI",

--- 1.218/sql/handler.cc	2006-09-12 18:54:03 +05:00
+++ 1.219/sql/handler.cc	2006-09-12 18:54:03 +05:00
@@ -1376,6 +1376,15 @@
 /****************************************************************************
 ** 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.178/sql/handler.h	2006-09-12 18:54:03 +05:00
+++ 1.179/sql/handler.h	2006-09-12 18:54:03 +05:00
@@ -563,6 +563,7 @@
     pushed_cond(NULL)
     {}
   virtual ~handler(void) { /* TODO: DBUG_ASSERT(inited == NONE); */ }
+  virtual handler *clone(MEM_ROOT *mem_root);
   int ha_open(const char *name, int mode, int test_if_locked);
   void adjust_next_insert_id_after_explicit_value(ulonglong nr);
   int update_auto_increment();