thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-15 02:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
serxa 2024-09-21 18:12:43 +00:00
parent 907ef0f717
commit b83fd18c9c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Common/ErrorCodes.cpp
View File

@ -609,12 +609,9 @@
M(728, UNEXPECTED_DATA_TYPE) \
M(729, ILLEGAL_TIME_SERIES_TAGS) \
M(730, REFRESH_FAILED) \
<<<<<<< HEAD
M(731, WORKLOAD_ENTITY_ALREADY_EXISTS) \
M(732, UNKNOWN_WORKLOAD_ENTITY) \
=======
M(731, QUERY_CACHE_USED_WITH_NON_THROW_OVERFLOW_MODE) \
>>>>>>> master
M(732, WORKLOAD_ENTITY_ALREADY_EXISTS) \
M(733, UNKNOWN_WORKLOAD_ENTITY) \
\
M(900, DISTRIBUTED_CACHE_ERROR) \
M(901, CANNOT_USE_DISTRIBUTED_CACHE) \