admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch-0.3.1' into 'branch-0.3.1'

Browse Source 
MS-224: Return AlreadyExist status in MySQLMetaImpl::CreateTable if table already exists

See merge request megasearch/milvus!208

Former-commit-id: 81bc6c31d47ab3b24fac1fd247531d78a58a5753
This commit is contained in:
peng.xu 2019-07-15 10:46:41 +08:00
commit 5f3533ba21
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpp/CHANGELOG.md
View File

@ -12,6 +12,7 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-153 - fix c_str error when connecting to MySQL
- MS-157 - fix changelog
- MS-190 - use env variable to switch mem manager and fix cmake
- MS-224 - Return AlreadyExist status in MySQLMetaImpl::CreateTable if table already exists
## Improvement
- MS-156 - Add unittest for merge result functions
@ -21,11 +22,9 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-208 - Add buildinde interface for C++ SDK
- MS-212 - Support Inner product metric type
## New Feature
- MS-195 - Add nlist and use_blas_threshold conf
## New Feature
- MS-180 - Add new mem manager
- MS-195 - Add nlist and use_blas_threshold conf
## Task

2
cpp/src/db/MySQLMetaImpl.cpp
View File

@ -347,7 +347,7 @@ namespace meta {
return Status::Error("Table already exists and it is in delete state, please wait a second");
}
else {
return Status::OK();//table already exists, no error
return Status::AlreadyExist("Table already exists");
}
}
}