bk commit into 4.1 tree (joreland:1.2330) BUG#11942

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas 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.2330 05/07/20 13:21:49 joreland@stripped +3 -0
  bug#11942 - ndb backup
    fix error code to avoid clash with 5.0/5.1

  ndb/src/ndbapi/ndberror.c
    1.28 05/07/20 13:21:46 joreland@stripped +2 -2
    Change error codes to remove clash from 5.0

  ndb/include/kernel/signaldata/DropTable.hpp
    1.3 05/07/20 13:21:46 joreland@stripped +1 -1
    Change error codes to remove clash from 5.0

  ndb/include/kernel/signaldata/AlterTable.hpp
    1.3 05/07/20 13:21:46 joreland@stripped +1 -1
    Change error codes to remove clash from 5.0

# 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:	joreland
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-4.1

--- 1.2/ndb/include/kernel/signaldata/AlterTable.hpp	2005-07-20 11:48:45 +02:00
+++ 1.3/ndb/include/kernel/signaldata/AlterTable.hpp	2005-07-20 13:21:46 +02:00
@@ -129,7 +129,7 @@
     InvalidPrimaryKeySize  = 739,
     NullablePrimaryKey = 740,
     UnsupportedChange = 741,
-    BackupInProgress = 746
+    BackupInProgress = 762
   };
 
 private:

--- 1.2/ndb/include/kernel/signaldata/DropTable.hpp	2005-07-20 11:48:45 +02:00
+++ 1.3/ndb/include/kernel/signaldata/DropTable.hpp	2005-07-20 13:21:46 +02:00
@@ -58,7 +58,7 @@
     InvalidTableVersion = 241,
     DropInProgress      = 283,
     NoDropTableRecordAvailable = 1229,
-    BackupInProgress = 745
+    BackupInProgress = 761
   };
 };
 

--- 1.27/ndb/src/ndbapi/ndberror.c	2005-07-20 11:48:45 +02:00
+++ 1.28/ndb/src/ndbapi/ndberror.c	2005-07-20 13:21:46 +02:00
@@ -312,8 +312,8 @@
   { 742,  SE, "Unsupported attribute type in index" },
   { 743,  SE, "Unsupported character set in table or index" },
   { 744,  SE, "Character string is invalid for given character set" },
-  { 745,  SE, "Unable to drop table as backup is in progress" },
-  { 746,  SE, "Unable to alter table as backup is in progress" },
+  { 761,  SE, "Unable to drop table as backup is in progress" },
+  { 762,  SE, "Unable to alter table as backup is in progress" },
   { 241,  SE, "Invalid schema object version" },
   { 283,  SE, "Table is being dropped" },
   { 284,  SE, "Table not defined in transaction coordinator" },