From c98285e05c40ef767e34c0b5fafcc714b101d3d2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 25 Mar 2021 02:59:50 +0000
Subject: [PATCH] fix conflicts

---
 src/kit/shell/src/shellCheck.c  | 2 +-
 src/kit/shell/src/shellEngine.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kit/shell/src/shellCheck.c b/src/kit/shell/src/shellCheck.c
index 3ff2582407..b88244ea01 100644
--- a/src/kit/shell/src/shellCheck.c
+++ b/src/kit/shell/src/shellCheck.c
@@ -196,4 +196,4 @@ void shellCheck(TAOS *con, SShellArguments *args) {
   int64_t end = taosGetTimestampMs();
   fprintf(stdout, "total %d tables checked, failed:%d, time spent %.2f seconds\n", checkedNum, errorNum,
           (end - start) / 1000.0);
-}
\ No newline at end of file
+}
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 66bb93a884..0eb1248fad 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -417,7 +417,7 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
 #ifdef WINDOWS
   if (tt < 0) tt = 0;
 #endif
-  if (tt <= 0 && ms != 0) {
+  if (tt <= 0 && ms < 0) {
     tt--;
     if (precision == TSDB_TIME_PRECISION_MICRO) {
       ms += 1000000;
-- 
GitLab