fix conflict

0377f865 · Ganlin Zhao · 85da616a · 0377f865 · 1163c0f6 · bd496f76
显示空白变更内容
内联并排

Showing with 5 addition and 5 deletion

source/libs/scalar/src/scalar.c source/libs/scalar/src/scalar.c +3 -3

tools/taos-tools tools/taos-tools +1 -1

tools/taosadapter tools/taosadapter +1 -1

未找到文件。
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -700,9 +700,9 @@ EDealRes sclRewriteNonConstOperator(SNode** pNode, SScalarCtx *ctx) {
 EDealRes sclRewriteFunction(SNode** pNode, SScalarCtx *ctx) {
  SFunctionNode *node = (SFunctionNode *)*pNode;
  SNode* tnode = NULL;
-  if (!fmIsScalarFunc(node->funcId)) {
+  //if (!fmIsScalarFunc(node->funcId)) {
-    return DEAL_RES_CONTINUE;
+  //  return DEAL_RES_CONTINUE;
-  }
+  //}
  FOREACH(tnode, node->pParameterList) {
    if (!SCL_IS_CONST_NODE(tnode)) {

--- a/taos-tools @ 1163c0f6
+++ b/taos-tools @ 1163c0f6
-Subproject commit bd496f76b64931c66da2f8b0f24143a98a881cde
+Subproject commit 1163c0f60aa65d6cc58283247c8bf8c56ba43b92
--- a/taosadapter @ c3815951
+++ b/taosadapter @ c3815951
-Subproject commit df8678f070e3f707faf59baebec90065f6e1268b
+Subproject commit c3815951fc80617ecd171f3743b8b4a4d0bc712e