From fe07364726d1f41c15b915292bfb87fe9fee312d Mon Sep 17 00:00:00 2001
From: unknown <joreland@mysql.com>
Date: Wed, 20 Jul 2005 13:21:49 +0200
Subject: [PATCH] bug#11942 - ndb backup   fix error code to avoid clash with
 5.0/5.1

ndb/include/kernel/signaldata/AlterTable.hpp:
  Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/DropTable.hpp:
  Change error codes to remove clash from 5.0
ndb/src/ndbapi/ndberror.c:
  Change error codes to remove clash from 5.0
---
 ndb/include/kernel/signaldata/AlterTable.hpp | 2 +-
 ndb/include/kernel/signaldata/DropTable.hpp  | 2 +-
 ndb/src/ndbapi/ndberror.c                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ndb/include/kernel/signaldata/AlterTable.hpp b/ndb/include/kernel/signaldata/AlterTable.hpp
index 71133d43798..173a9acf9ed 100644
--- a/ndb/include/kernel/signaldata/AlterTable.hpp
+++ b/ndb/include/kernel/signaldata/AlterTable.hpp
@@ -129,7 +129,7 @@ public:
     InvalidPrimaryKeySize  = 739,
     NullablePrimaryKey = 740,
     UnsupportedChange = 741,
-    BackupInProgress = 746
+    BackupInProgress = 762
   };
 
 private:
diff --git a/ndb/include/kernel/signaldata/DropTable.hpp b/ndb/include/kernel/signaldata/DropTable.hpp
index 19700120788..cae6aff8754 100644
--- a/ndb/include/kernel/signaldata/DropTable.hpp
+++ b/ndb/include/kernel/signaldata/DropTable.hpp
@@ -58,7 +58,7 @@ public:
     InvalidTableVersion = 241,
     DropInProgress      = 283,
     NoDropTableRecordAvailable = 1229,
-    BackupInProgress = 745
+    BackupInProgress = 761
   };
 };
 
diff --git a/ndb/src/ndbapi/ndberror.c b/ndb/src/ndbapi/ndberror.c
index 86f81631e26..6fdc75fbe7e 100644
--- a/ndb/src/ndbapi/ndberror.c
+++ b/ndb/src/ndbapi/ndberror.c
@@ -312,8 +312,8 @@ ErrorBundle ErrorCodes[] = {
   { 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" },