bk commit into 5.0 tree (svoj:1.2272)

[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-18 16:23:45+05:00, svoj@april.(none) +5 -0
  Merge svojtovich@stripped:/home/bk/mysql-5.0
  into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
  MERGE: 1.2244.8.5

  mysql-test/r/myisam.result@stripped, 2006-09-18 16:21:53+05:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.79.1.1

  mysql-test/t/myisam.test@stripped, 2006-09-18 16:21:53+05:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.61.1.1

  sql/ha_ndbcluster.cc@stripped, 2006-09-18 16:21:53+05:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.275.1.1

  sql/opt_range.cc@stripped, 2006-09-18 16:21:54+05:00, svoj@april.(none) +0 -0
    Auto merged
    MERGE: 1.217.1.1

  sql/share/errmsg.txt@stripped, 2006-09-18 16:23:42+05:00, svoj@april.(none) +0 -0
    SCCS merged
    MERGE: 1.68.2.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/merge/mysql-5.0-engines/RESYNC

--- 1.223/sql/opt_range.cc	2006-09-18 16:23:50 +05:00
+++ 1.224/sql/opt_range.cc	2006-09-18 16:23:50 +05:00
@@ -1034,10 +1034,7 @@
   }
 
   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;

--- 1.70/sql/share/errmsg.txt	2006-09-18 16:23:50 +05:00
+++ 1.71/sql/share/errmsg.txt	2006-09-18 16:23:50 +05:00
@@ -5623,6 +5623,8 @@
 	eng "Triggers can not be created on system tables"
 ER_REMOVED_SPACES
         eng "Leading spaces are removed from name '%s'"
+ER_AUTOINC_READ_FAILED
+        eng "Failed to read auto-increment value from storage engine"
 ER_USERNAME
 	eng "user name"
 ER_HOSTNAME

--- 1.278/sql/ha_ndbcluster.cc	2006-09-18 16:23:51 +05:00
+++ 1.279/sql/ha_ndbcluster.cc	2006-09-18 16:23:51 +05:00
@@ -2131,9 +2131,11 @@
     if (has_auto_increment) 
     {
       THD *thd= table->in_use;
+      int error;
       
       m_skip_auto_increment= FALSE;
-      update_auto_increment();
+      if ((error= update_auto_increment()))
+        DBUG_RETURN(error);
       /* Ensure that handler is always called for auto_increment values */
       thd->next_insert_id= 0;
       m_skip_auto_increment= !auto_increment_column_changed;