fix connection leak

src/sql/engine/cmd/ob_get_diagnostics_executor.cpp

@@ -422,9 +422,8 @@ int ObGetDiagnosticsExecutor::execute(ObExecContext &ctx, ObGetDiagnosticsStmt &
             EXTRACT_VARCHAR_FIELD_MYSQL(*result, "message", err_msg);
             EXTRACT_INT_FIELD_MYSQL(*result, "ori_code", err_ret, int);
             EXTRACT_VARCHAR_FIELD_MYSQL(*result, "sql_state", sqlstate);
-            if (OB_FAIL(pool->acquire(session_info, conn))) {
-              LOG_WARN("failed to get conn", K(ret));
-            } else if (OB_FAIL(ob_write_string(ctx.get_allocator(), err_msg, err_msg_c, true))) { 
+            if (OB_FAIL(ret)) {
+	          } else if (OB_FAIL(ob_write_string(ctx.get_allocator(), err_msg, err_msg_c, true))) {
               //when using ptr(), char *'s end should be '\0'
               LOG_WARN("ob write string failed", K(ret));
             } else if (OB_FAIL(ob_write_string(ctx.get_allocator(), sqlstate, sqlstate_c, true))) { 
@@ -581,4 +580,4 @@ int ObGetDiagnosticsExecutor::execute(ObExecContext &ctx, ObGetDiagnosticsStmt &
 }
 #undef SET_OBJ_VAR
 }/* ns sql*/
-}/* ns oceanbase */
\ No newline at end of file
+}/* ns oceanbase */

src/sql/engine/expr/ob_expr_to_outfile_row.cpp

@@ -199,9 +199,9 @@ int ObExprToOutfileRow::to_outfile_str(const ObExpr &expr, ObEvalCtx &ctx, ObDat
         }
       } while (OB_SIZE_OVERFLOW == ret
                && OB_SUCC(extend_buffer(*out_info, ctx.exec_ctx_.get_allocator())));
-    }
-  }
-  return ret;
+    }
+  }
+  return ret;
 }
 
 int ObExprToOutfileRow::extract_fisrt_wchar_from_varhcar(const ObObj &obj, int32_t &wchar)