xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
yihaoDeng 2021-01-03 13:20:56 +00:00
parent ae661f7b9d
commit b740129fcf
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/src/tscSystem.c
View File

@ -223,7 +223,6 @@ void taos_cleanup(void) {
taosCleanupKeywordsTable(); taosCleanupKeywordsTable();
taosCloseLog(); taosCloseLog();
<<<<<<< HEAD
m = tscRpcCache; m = tscRpcCache;
if (m != NULL && atomic_val_compare_exchange_ptr(&tscRpcCache, m, 0) == m) { if (m != NULL && atomic_val_compare_exchange_ptr(&tscRpcCache, m, 0) == m) {
@ -235,8 +234,6 @@ void taos_cleanup(void) {
} }
if (tscEmbedded == 0) rpcCleanup(); if (tscEmbedded == 0) rpcCleanup();
=======
>>>>>>> ca3888c190d0415c151964a89652811e37089afd
if (tscEmbedded == 0) { if (tscEmbedded == 0) {
rpcCleanup(); rpcCleanup();