thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLICKHOUSE-3878: Try to avoid merge conflict

Browse Source
This commit is contained in:
alesapin 2018-08-08 19:49:49 +03:00
parent 46e9dc132a
commit 65c6a8ff93
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Common/ErrorCodes.cpp
View File

@ -379,7 +379,8 @@ namespace ErrorCodes
extern const int CANNOT_IOSETUP = 402;
extern const int INVALID_JOIN_ON_EXPRESSION = 403;
extern const int BAD_ODBC_CONNECTION_STRING = 404;
extern const int BAD_REQUEST_PARAMETER = 405;
extern const int PARTITION_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT = 405;
extern const int BAD_REQUEST_PARAMETER = 406;
extern const int KEEPER_EXCEPTION = 999;
extern const int POCO_EXCEPTION = 1000;