Skip to content

Commit e3fb4b9

Browse files
committed
#8739 Replace wrong uses of SQLstate class 08 (connection error)
1 parent 646bdaa commit e3fb4b9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/include/gen/sql_state.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static const struct {
3232
{335544329, "42000"}, // 9 bad_segstr_id
3333
{335544330, "HY000"}, // 10 bad_tpb_content
3434
{335544331, "HY000"}, // 11 bad_tpb_form
35-
{335544332, "08003"}, // 12 bad_trans_handle
35+
{335544332, "HY000"}, // 12 bad_trans_handle
3636
{335544333, "XX000"}, // 13 bug_check
3737
{335544334, "22018"}, // 14 convert_error
3838
{335544335, "XX001"}, // 15 db_corrupt
@@ -320,7 +320,7 @@ static const struct {
320320
{335544617, "42000"}, // 297 order_by_err
321321
{335544618, "HY000"}, // 298 return_mode_err
322322
{335544619, "38000"}, // 299 extern_func_err
323-
{335544620, "08001"}, // 300 alias_conflict_err
323+
{335544620, "42000"}, // 300 alias_conflict_err
324324
{335544621, "42000"}, // 301 procedure_conflict_error
325325
{335544622, "42000"}, // 302 relation_conflict_err
326326
{335544623, "42000"}, // 303 dsql_domain_err
@@ -721,7 +721,7 @@ static const struct {
721721
{335545018, "42000"}, // 698 private_function
722722
{335545019, "42000"}, // 699 private_procedure
723723
{335545020, "24000"}, // 700 request_outdated
724-
{335545021, "08003"}, // 701 bad_events_handle
724+
{335545021, "HY000"}, // 701 bad_events_handle
725725
{335545022, "XX000"}, // 702 cannot_copy_stmt
726726
{335545023, "22000"}, // 703 invalid_boolean_usage
727727
{335545024, "42000"}, // 704 sysf_argscant_both_be_zero
@@ -859,7 +859,7 @@ static const struct {
859859
{335545156, "42000"}, // 836 sysf_invalid_first_last_part
860860
{335545157, "42000"}, // 837 sysf_invalid_date_timestamp
861861
{335545158, "HY104"}, // 838 precision_err2
862-
{335545159, "08003"}, // 839 bad_batch_handle
862+
{335545159, "HY000"}, // 839 bad_batch_handle
863863
{335545160, "22021"}, // 840 intl_char
864864
{335545161, "22000"}, // 841 null_block
865865
{335545162, "22000"}, // 842 mixed_info
@@ -884,7 +884,7 @@ static const struct {
884884
{335545181, "22000"}, // 861 message_format
885885
{335545182, "22000"}, // 862 batch_param_version
886886
{335545183, "54000"}, // 863 batch_msg_long
887-
{335545184, "08002"}, // 864 batch_open
887+
{335545184, "HY010"}, // 864 batch_open
888888
{335545185, "07003"}, // 865 batch_type
889889
{335545186, "07001"}, // 866 batch_param
890890
{335545187, "07001"}, // 867 batch_blobs

src/msgs/system_errors2.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
1212
(-901, '42', '000', 0, 9, 'bad_segstr_id', NULL, 'ERROR')
1313
(-901, 'HY', '000', 0, 10, 'bad_tpb_content', NULL, 'ERROR')
1414
(-901, 'HY', '000', 0, 11, 'bad_tpb_form', NULL, 'ERROR')
15-
(-901, '08', '003', 0, 12, 'bad_trans_handle', NULL, 'ERROR')
15+
(-901, 'HY', '000', 0, 12, 'bad_trans_handle', NULL, 'ERROR')
1616
(-902, 'XX', '000', 0, 13, 'bug_check', NULL, 'SEVERE')
1717
(-413, '22', '018', 0, 14, 'convert_error', NULL, 'ERROR')
1818
(-902, 'XX', '001', 0, 15, 'db_corrupt', NULL, 'SEVERE')
@@ -300,7 +300,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
300300
(-208, '42', '000', 0, 297, 'order_by_err', NULL, NULL)
301301
(-171, 'HY', '000', 0, 298, 'return_mode_err', NULL, NULL)
302302
(-170, '38', '000', 0, 299, 'extern_func_err', NULL, NULL)
303-
(-204, '08', '001', 0, 300, 'alias_conflict_err', NULL, NULL)
303+
(-204, '42', '000', 0, 300, 'alias_conflict_err', NULL, NULL)
304304
(-204, '42', '000', 0, 301, 'procedure_conflict_error', NULL, NULL)
305305
(-204, '42', '000', 0, 302, 'relation_conflict_err', NULL, NULL)
306306
(-901, '42', '000', 0, 303, 'dsql_domain_err', NULL, NULL)
@@ -706,7 +706,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
706706
(-901, '42', '000', 0, 698, 'private_function', NULL, NULL)
707707
(-901, '42', '000', 0, 699, 'private_procedure', NULL, NULL)
708708
(-904, '24', '000', 0, 700, 'request_outdated', NULL, NULL)
709-
(-901, '08', '003', 0, 701, 'bad_events_handle', NULL, 'ERROR')
709+
(-901, 'HY', '000', 0, 701, 'bad_events_handle', NULL, 'ERROR')
710710
(-104, 'XX', '000', 0, 702, 'cannot_copy_stmt', NULL, NULL)
711711
(-104, '22', '000', 0, 703, 'invalid_boolean_usage', NULL, NULL)
712712
(-833, '42', '000', 0, 704, 'sysf_argscant_both_be_zero', NULL, NULL)
@@ -845,7 +845,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
845845
(-833, '42', '000', 0, 836, 'sysf_invalid_first_last_part', NULL, NULL)
846846
(-833, '42', '000', 0, 837, 'sysf_invalid_date_timestamp', NULL, NULL)
847847
(-842, 'HY', '104', 0, 838, 'precision_err2', NULL, NULL)
848-
(-901, '08', '003', 0, 839, 'bad_batch_handle', NULL, NULL)
848+
(-901, 'HY', '000', 0, 839, 'bad_batch_handle', NULL, NULL)
849849
(-901, '22', '021', 0, 840, 'intl_char', NULL, NULL)
850850
(-901, '22', '000', 0, 841, 'null_block', NULL, NULL)
851851
(-901, '22', '000', 0, 842, 'mixed_info', NULL, NULL)
@@ -870,7 +870,7 @@ set bulk_insert INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, FA
870870
(-901, '22', '000', 0, 861, 'message_format', NULL, NULL)
871871
(-901, '22', '000', 0, 862, 'batch_param_version', NULL, NULL)
872872
(-901, '54', '000', 0, 863, 'batch_msg_long', NULL, NULL)
873-
(-901, '08', '002', 0, 864, 'batch_open', NULL, NULL)
873+
(-901, 'HY', '010', 0, 864, 'batch_open', NULL, NULL)
874874
(-901, '07', '003', 0, 865, 'batch_type', NULL, NULL)
875875
(-901, '07', '001', 0, 866, 'batch_param', NULL, NULL)
876876
(-901, '07', '001', 0, 867, 'batch_blobs', NULL, NULL)

0 commit comments

Comments
 (0)