fixed_merge_conflict:wq

c154675a · millb · 57f67801 · c154675a
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

dbms/src/Common/ErrorCodes.cpp dbms/src/Common/ErrorCodes.cpp +1 -0

未找到文件。
--- a/dbms/src/Common/ErrorCodes.cpp
+++ b/dbms/src/Common/ErrorCodes.cpp
@@ -466,6 +466,7 @@ namespace ErrorCodes
    extern const int INCORRECT_DICTIONARY_DEFINITION = 489;
    extern const int UNACCEPTABLE_URL = 490;

+
    extern const int KEEPER_EXCEPTION = 999;
    extern const int POCO_EXCEPTION = 1000;
    extern const int STD_EXCEPTION = 1001;