From 1ec2cff29a3928b72a7b64d28cbb5f179ef9ac17 Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Mon, 9 Aug 2021 11:04:16 +0800
Subject: [PATCH 1/2] [TD-5784]<fix>: fixed a wrong check

---
 src/plugins/http/src/httpUtil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/http/src/httpUtil.c b/src/plugins/http/src/httpUtil.c
index 27b95a4934..ade50bdad6 100644
--- a/src/plugins/http/src/httpUtil.c
+++ b/src/plugins/http/src/httpUtil.c
@@ -188,7 +188,7 @@ bool httpMallocMultiCmds(HttpContext *pContext, int32_t cmdSize, int32_t bufferS
 bool httpReMallocMultiCmdsSize(HttpContext *pContext, int32_t cmdSize) {
   HttpSqlCmds *multiCmds = pContext->multiCmds;
 
-  if (cmdSize <= 0 && cmdSize > HTTP_MAX_CMD_SIZE) {
+  if (cmdSize <= 0 || cmdSize > HTTP_MAX_CMD_SIZE) {
     httpError("context:%p, fd:%d, user:%s, mulitcmd size:%d large then %d", pContext, pContext->fd, pContext->user,
               cmdSize, HTTP_MAX_CMD_SIZE);
     return false;

From 2fbe5f8639838438ecab5fdfb7f98f362bd99321 Mon Sep 17 00:00:00 2001
From: Yiqing Liu <yqliu@taosdata.com>
Date: Tue, 10 Aug 2021 10:12:08 +0800
Subject: [PATCH 2/2] Revert "Test/test ci skip 2.0 [ci skip]"

---
 .drone.yml  | 6 +-----
 Jenkinsfile | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index cbe5c03318..b520f308ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -150,7 +150,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_trusty
@@ -177,7 +176,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_xenial
@@ -203,7 +201,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 
 ---
 kind: pipeline
@@ -229,7 +226,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_centos7
@@ -253,4 +249,4 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
\ No newline at end of file
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 14bc6abfbd..4838850722 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ node {
 }
 
 def skipstage=0
-def skipbuild=0
+
 def abortPreviousBuilds() {
   def currentJobName = env.JOB_NAME
   def currentBuildNumber = env.BUILD_NUMBER.toInteger()
@@ -125,7 +125,6 @@ pipeline {
           agent{label 'master'}
           when {
               changeRequest()
-              
           }
           steps {
             script{
@@ -159,8 +158,6 @@ pipeline {
           
           script{
             env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) 
-            env.skipbuild=sh(script: "git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]'", returnStatus: true)
-
           }
           println env.skipstage
           sh'''
@@ -175,7 +172,6 @@ pipeline {
               changeRequest()
                expression {
                     env.skipstage != 0
-                    env.skipbuild ==1
               }
           }
       parallel {