Merge pull request #7708 from volzhs/match-err

Match ERROR_QUERY_FAILED enum with others

[ci skip]

core/error_list.h

@@ -58,7 +58,7 @@ enum Error {
 	ERR_FILE_EOF,
 	ERR_CANT_OPEN, ///< Can't open a resource/socket/file
 	ERR_CANT_CREATE,		// (20)
-	ERROR_QUERY_FAILED,
+	ERR_QUERY_FAILED,
 	ERR_ALREADY_IN_USE,
  	ERR_LOCKED, ///< resource is locked
  	ERR_TIMEOUT,

core/global_constants.cpp

@@ -434,7 +434,7 @@ static _GlobalConstant _global_constants[]={
 	BIND_GLOBAL_CONSTANT( ERR_CANT_OPEN ), ///< Can't open a resource/socket/file
 	BIND_GLOBAL_CONSTANT( ERR_CANT_CREATE ),
 	BIND_GLOBAL_CONSTANT( ERR_PARSE_ERROR ),
-	BIND_GLOBAL_CONSTANT( ERROR_QUERY_FAILED ),
+	BIND_GLOBAL_CONSTANT( ERR_QUERY_FAILED ),
 	BIND_GLOBAL_CONSTANT( ERR_ALREADY_IN_USE ),
 	BIND_GLOBAL_CONSTANT( ERR_LOCKED ), ///< resource is locked
 	BIND_GLOBAL_CONSTANT( ERR_TIMEOUT ),