diff --git a/lang_helpers/gds_codes.ftn b/lang_helpers/gds_codes.ftn index c143759700..996c19f887 100644 --- a/lang_helpers/gds_codes.ftn +++ b/lang_helpers/gds_codes.ftn @@ -1924,8 +1924,8 @@ C -- PARAMETER (GDS__invalid_time_zone_bind = 335545255) INTEGER*4 GDS__invalid_decfloat_bind PARAMETER (GDS__invalid_decfloat_bind = 335545256) - INTEGER*4 GDS__hex_len - PARAMETER (GDS__hex_len = 335545257) + INTEGER*4 GDS__odd_hex_len + PARAMETER (GDS__odd_hex_len = 335545257) INTEGER*4 GDS__hex_digit PARAMETER (GDS__hex_digit = 335545258) INTEGER*4 GDS__gfix_db_name diff --git a/lang_helpers/gds_codes.pas b/lang_helpers/gds_codes.pas index 8cda21ce0a..0408eca5cd 100644 --- a/lang_helpers/gds_codes.pas +++ b/lang_helpers/gds_codes.pas @@ -1919,8 +1919,8 @@ const gds_invalid_time_zone_bind = 335545255; isc_invalid_decfloat_bind = 335545256; gds_invalid_decfloat_bind = 335545256; - isc_hex_len = 335545257; - gds_hex_len = 335545257; + isc_odd_hex_len = 335545257; + gds_odd_hex_len = 335545257; isc_hex_digit = 335545258; gds_hex_digit = 335545258; isc_gfix_db_name = 335740929; diff --git a/src/include/gen/codetext.h b/src/include/gen/codetext.h index 577782ff02..44616ae9af 100644 --- a/src/include/gen/codetext.h +++ b/src/include/gen/codetext.h @@ -958,7 +958,7 @@ static const struct { {"effective_user", 335545254}, {"invalid_time_zone_bind", 335545255}, {"invalid_decfloat_bind", 335545256}, - {"hex_len", 335545257}, + {"odd_hex_len", 335545257}, {"hex_digit", 335545258}, {"gfix_db_name", 335740929}, {"gfix_invalid_sw", 335740930}, diff --git a/src/include/gen/iberror.h b/src/include/gen/iberror.h index 93d7289107..c28b2aad39 100644 --- a/src/include/gen/iberror.h +++ b/src/include/gen/iberror.h @@ -992,7 +992,7 @@ const ISC_STATUS isc_eds_input_prm_not_used = 335545253L; const ISC_STATUS isc_effective_user = 335545254L; const ISC_STATUS isc_invalid_time_zone_bind = 335545255L; const ISC_STATUS isc_invalid_decfloat_bind = 335545256L; -const ISC_STATUS isc_hex_len = 335545257L; +const ISC_STATUS isc_odd_hex_len = 335545257L; const ISC_STATUS isc_hex_digit = 335545258L; const ISC_STATUS isc_gfix_db_name = 335740929L; const ISC_STATUS isc_gfix_invalid_sw = 335740930L; @@ -2443,7 +2443,7 @@ const ISC_STATUS isc_err_max = 1425; #define isc_effective_user 335545254L #define isc_invalid_time_zone_bind 335545255L #define isc_invalid_decfloat_bind 335545256L -#define isc_hex_len 335545257L +#define isc_odd_hex_len 335545257L #define isc_hex_digit 335545258L #define isc_gfix_db_name 335740929L #define isc_gfix_invalid_sw 335740930L diff --git a/src/include/gen/msgs.h b/src/include/gen/msgs.h index 85f8c6976a..0ea50d4b3f 100644 --- a/src/include/gen/msgs.h +++ b/src/include/gen/msgs.h @@ -961,7 +961,7 @@ Data source : @4"}, /* eds_statement */ {335545254, "Effective user is @1"}, /* effective_user */ {335545255, "Invalid time zone bind mode @1"}, /* invalid_time_zone_bind */ {335545256, "Invalid decfloat bind mode @1"}, /* invalid_decfloat_bind */ - {335545257, "Invalid hex text length @1, should be multiple of 2"}, /* hex_len */ + {335545257, "Invalid hex text length @1, should be multiple of 2"}, /* odd_hex_len */ {335545258, "Invalid hex digit @1 at position @2"}, /* hex_digit */ {335740929, "data base file name (@1) already given"}, /* gfix_db_name */ {335740930, "invalid switch @1"}, /* gfix_invalid_sw */ diff --git a/src/include/gen/sql_code.h b/src/include/gen/sql_code.h index d25ff39d19..e9c5164faa 100644 --- a/src/include/gen/sql_code.h +++ b/src/include/gen/sql_code.h @@ -957,7 +957,7 @@ static const struct { {335545254, -551}, /* 934 effective_user */ {335545255, -901}, /* 935 invalid_time_zone_bind */ {335545256, -901}, /* 936 invalid_decfloat_bind */ - {335545257, -901}, /* 937 hex_len */ + {335545257, -901}, /* 937 odd_hex_len */ {335545258, -901}, /* 938 hex_digit */ {335740929, -901}, /* 1 gfix_db_name */ {335740930, -901}, /* 2 gfix_invalid_sw */ diff --git a/src/include/gen/sql_state.h b/src/include/gen/sql_state.h index a56fd31d53..60e221793f 100644 --- a/src/include/gen/sql_state.h +++ b/src/include/gen/sql_state.h @@ -957,7 +957,7 @@ static const struct { {335545254, "28000"}, // 934 effective_user {335545255, "42000"}, // 935 invalid_time_zone_bind {335545256, "42000"}, // 936 invalid_decfloat_bind - {335545257, "22023"}, // 937 hex_len + {335545257, "22023"}, // 937 odd_hex_len {335545258, "22023"}, // 938 hex_digit {335740929, "00000"}, // 1 gfix_db_name {335740930, "00000"}, // 2 gfix_invalid_sw diff --git a/src/jrd/SysFunction.cpp b/src/jrd/SysFunction.cpp index 776e9d83e5..b415cc1b7d 100644 --- a/src/jrd/SysFunction.cpp +++ b/src/jrd/SysFunction.cpp @@ -1290,7 +1290,7 @@ void makeDecodeHex(DataTypeUtilBase* dataTypeUtil, const SysFunction* function, { unsigned len = args[0]->getStringLength(); if (len % 2 || !len) - status_exception::raise(Arg::Gds(isc_hex_len) << Arg::Num(len)); + status_exception::raise(Arg::Gds(isc_odd_hex_len) << Arg::Num(len)); result->makeVarying(len / 2, ttype_binary); } else diff --git a/src/msgs/messages2.sql b/src/msgs/messages2.sql index 8f58607fc8..0ec1ec935e 100644 --- a/src/msgs/messages2.sql +++ b/src/msgs/messages2.sql @@ -1044,7 +1044,7 @@ Data source : @4', NULL, NULL) ('effective_user', NULL, NULL, NULL, 0, 934, NULL, 'Effective user is @1', NULL, NULL); ('invalid_time_zone_bind', NULL, 'jrd.cpp', NULL, 0, 935, NULL, 'Invalid time zone bind mode @1', NULL, NULL); ('invalid_decfloat_bind', NULL, 'jrd.cpp', NULL, 0, 936, NULL, 'Invalid decfloat bind mode @1', NULL, NULL); -('hex_len', NULL, 'SysFunction.cpp', NULL, 0, 937, NULL, 'Invalid hex text length @1, should be multiple of 2', NULL, NULL); +('odd_hex_len', NULL, 'SysFunction.cpp', NULL, 0, 937, NULL, 'Invalid hex text length @1, should be multiple of 2', NULL, NULL); ('hex_digit', NULL, 'SysFunction.cpp', NULL, 0, 938, NULL, 'Invalid hex digit @1 at position @2', NULL, NULL); -- QLI (NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL); diff --git a/src/msgs/system_errors2.sql b/src/msgs/system_errors2.sql index e223e2bdb0..0c2c89557c 100644 --- a/src/msgs/system_errors2.sql +++ b/src/msgs/system_errors2.sql @@ -943,7 +943,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA (-551, '28', '000', 0, 934, 'effective_user', NULL, 'ERROR') (-901, '42', '000', 0, 935, 'invalid_time_zone_bind', NULL, NULL) (-901, '42', '000', 0, 936, 'invalid_decfloat_bind', NULL, NULL) -(-901, '22', '023', 0, 937, 'hex_len', NULL, NULL) +(-901, '22', '023', 0, 937, 'odd_hex_len', NULL, NULL) (-901, '22', '023', 0, 938, 'hex_digit', NULL, NULL) -- GFIX (-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)