Correct merge result

This commit is contained in:
Robert Schulze 2023-09-20 13:27:11 +00:00
parent 5729871605
commit c75f7c8434
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A

View File

@ -585,8 +585,9 @@
M(700, USER_SESSION_LIMIT_EXCEEDED) \ M(700, USER_SESSION_LIMIT_EXCEEDED) \
M(701, CLUSTER_DOESNT_EXIST) \ M(701, CLUSTER_DOESNT_EXIST) \
M(702, CLIENT_INFO_DOES_NOT_MATCH) \ M(702, CLIENT_INFO_DOES_NOT_MATCH) \
M(703, CANNOT_USE_QUERY_CACHE_WITH_NONDETERMINISTIC_FUNCTIONS) \ M(703, INVALID_IDENTIFIER) \
M(704, INVALID_IDENTIFIER) \ M(704, CANNOT_USE_QUERY_CACHE_WITH_NONDETERMINISTIC_FUNCTIONS) \
\
M(999, KEEPER_EXCEPTION) \ M(999, KEEPER_EXCEPTION) \
M(1000, POCO_EXCEPTION) \ M(1000, POCO_EXCEPTION) \
M(1001, STD_EXCEPTION) \ M(1001, STD_EXCEPTION) \