From 6b3e11dd40c35f064a4961f178ef7d95f67d78fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20G=C3=B6dderz?= <tobias@arangodb.com>
Date: Tue, 13 Aug 2019 15:18:45 +0200
Subject: [PATCH] Fixed error code to not re-use an old one (#9686)

---
 js/common/bootstrap/errors.js | 2 +-
 lib/Basics/errors.dat         | 2 +-
 lib/Basics/voc-errors.cpp     | 2 +-
 lib/Basics/voc-errors.h       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js
index e8b2c53dac..8cf58e4786 100644
--- a/js/common/bootstrap/errors.js
+++ b/js/common/bootstrap/errors.js
@@ -131,7 +131,7 @@
     "ERROR_REPLICATION_START_TICK_NOT_PRESENT" : { "code" : 1414, "message" : "start tick not present" },
     "ERROR_REPLICATION_WRONG_CHECKSUM" : { "code" : 1416, "message" : "wrong checksum" },
     "ERROR_REPLICATION_SHARD_NONEMPTY" : { "code" : 1417, "message" : "shard not empty" },
-    "ERROR_CLUSTER_SERVER_UNKNOWN" : { "code" : 1452, "message" : "got a request from an unkown server" },
+    "ERROR_CLUSTER_SERVER_UNKNOWN" : { "code" : 1449, "message" : "got a request from an unkown server" },
     "ERROR_CLUSTER_COLLECTION_ID_EXISTS" : { "code" : 1453, "message" : "collection ID already exists" },
     "ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN" : { "code" : 1454, "message" : "could not create collection in plan" },
     "ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION" : { "code" : 1456, "message" : "could not create collection" },
diff --git a/lib/Basics/errors.dat b/lib/Basics/errors.dat
index 8cba85e289..300d6bc93a 100755
--- a/lib/Basics/errors.dat
+++ b/lib/Basics/errors.dat
@@ -169,7 +169,7 @@ ERROR_REPLICATION_SHARD_NONEMPTY,1417,"shard not empty","Will be raised when a s
 ## ArangoDB cluster errors
 ################################################################################
 
-ERROR_CLUSTER_SERVER_UNKNOWN,1452,"got a request from an unkown server","Will be raised on some occasions when one server gets a request from another, which has not (yet?) been made known via the agency."
+ERROR_CLUSTER_SERVER_UNKNOWN,1449,"got a request from an unkown server","Will be raised on some occasions when one server gets a request from another, which has not (yet?) been made known via the agency."
 ERROR_CLUSTER_COLLECTION_ID_EXISTS,1453,"collection ID already exists","Will be raised when a coordinator in a cluster tries to create a collection and the collection ID already exists."
 ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN,1454,"could not create collection in plan","Will be raised when a coordinator in a cluster cannot create an entry for a new collection in the Plan hierarchy in the agency."
 ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION,1456,"could not create collection","Will be raised when a coordinator in a cluster notices that some DBServers report problems when creating shards for a new collection."
diff --git a/lib/Basics/voc-errors.cpp b/lib/Basics/voc-errors.cpp
index 2b860f3f40..939601e81a 100644
--- a/lib/Basics/voc-errors.cpp
+++ b/lib/Basics/voc-errors.cpp
@@ -1,8 +1,8 @@
 /// auto-generated file generated from errors.dat
 
-#include "Basics/voc-errors.h"
 #include "Basics/Common.h"
 #include "Basics/error.h"
+#include "Basics/voc-errors.h"
 
 /// helper macro to define an error string
 #define REG_ERROR(id, label) TRI_set_errno_string(TRI_ ## id, label);
diff --git a/lib/Basics/voc-errors.h b/lib/Basics/voc-errors.h
index 15f2e01c82..1668f3507e 100644
--- a/lib/Basics/voc-errors.h
+++ b/lib/Basics/voc-errors.h
@@ -658,11 +658,11 @@ constexpr int TRI_ERROR_REPLICATION_WRONG_CHECKSUM
 /// Will be raised when a shard is not empty and the follower tries a shortcut
 constexpr int TRI_ERROR_REPLICATION_SHARD_NONEMPTY                              = 1417;
 
-/// 1452: ERROR_CLUSTER_SERVER_UNKNOWN
+/// 1449: ERROR_CLUSTER_SERVER_UNKNOWN
 /// "got a request from an unkown server"
 /// Will be raised on some occasions when one server gets a request from
 /// another, which has not (yet?) been made known via the agency.
-constexpr int TRI_ERROR_CLUSTER_SERVER_UNKNOWN                                  = 1452;
+constexpr int TRI_ERROR_CLUSTER_SERVER_UNKNOWN                                  = 1449;
 
 /// 1453: ERROR_CLUSTER_COLLECTION_ID_EXISTS
 /// "collection ID already exists"