bk commit into 5.0 tree (msvensson:1.1880)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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
  1.1880 05/04/07 20:19:25 msvensson@neptunus.(none) +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/share/errmsg.txt
    1.23 05/04/07 20:19:23 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/handler.cc
    1.159 05/04/07 20:19:23 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.172 05/04/07 20:19:23 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.158/sql/handler.cc	2005-04-06 20:20:30 +02:00
+++ 1.159/sql/handler.cc	2005-04-07 20:19:23 +02:00
@@ -304,6 +304,7 @@
   SETMSG(HA_ERR_NO_SUCH_TABLE,          "No such table: '%.64s'");
   SETMSG(HA_ERR_TABLE_EXIST,            ER(ER_TABLE_EXISTS_ERROR));
   SETMSG(HA_ERR_NO_CONNECTION,          "Could not connect to storage engine");
+  SETMSG(HA_ERR_TABLE_DEF_CHANGED,      ER(ER_TABLE_DEF_CHANGED));
 
   /* Register the error messages for use with my_error(). */
   return my_error_register(errmsgs, HA_ERR_FIRST, HA_ERR_LAST);
@@ -1648,6 +1649,9 @@
     break;
   case HA_ERR_NO_REFERENCED_ROW:
     textno=ER_NO_REFERENCED_ROW;
+    break;
+  case HA_ERR_TABLE_DEF_CHANGED:
+    textno=ER_TABLE_DEF_CHANGED;
     break;
   case HA_ERR_NO_SUCH_TABLE:
   {

--- 1.22/sql/share/errmsg.txt	2005-04-06 18:43:27 +02:00
+++ 1.23/sql/share/errmsg.txt	2005-04-07 20:19:23 +02:00
@@ -5336,3 +5336,6 @@
 	eng "You are not allowed to create a user with GRANT"
 ER_WRONG_VALUE_FOR_TYPE  
 	eng "Incorrect %-.32s value: '%-.128s' for function %-.32s"
+ER_TABLE_DEF_CHANGED
+	eng "Table definition has changed, please retry transaction"
+

--- 1.171/sql/ha_ndbcluster.cc	2005-04-07 20:17:34 +02:00
+++ 1.172/sql/ha_ndbcluster.cc	2005-04-07 20:19:23 +02:00
@@ -5822,6 +5822,7 @@
   {
     thd->cleanup();
     delete thd;
+    delete ndb;
     DBUG_RETURN(NULL);
   }
 
@@ -5940,6 +5941,7 @@
 
   thd->cleanup();
   delete thd;
+  delete ndb;
   DBUG_PRINT("exit", ("ndb_util_thread"));
   my_thread_end();
   pthread_exit(0);