fix mysqltest

4bd3f4e0 · obdev · OB-robot · 60eb5b7d · 4bd3f4e0
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/sql/engine/set/ob_merge_set_op.cpp src/sql/engine/set/ob_merge_set_op.cpp +1 -1

未找到文件。
--- a/src/sql/engine/set/ob_merge_set_op.cpp
+++ b/src/sql/engine/set/ob_merge_set_op.cpp
@@ -368,7 +368,7 @@ int ObMergeSetOp::locate_next_left_inside(ObOperator &child_op,
                && OB_FAIL(cmp_(*last_row_.store_row_, child_op.get_spec().output_,
                                curr_idx, eval_ctx_, cmp))) {
        LOG_WARN("failed to compare row", K(ret));
-      } else if (last_idx < 0) {
+      } else if (nullptr == last_row_.store_row_ && last_idx < 0) {
        ret = OB_ERR_UNEXPECTED;
        LOG_WARN("get wrong last idx", K(ret));
      } else if (nullptr == last_row_.store_row_