diff --git a/src/sql/engine/expr/ob_expr_to_outfile_row.cpp b/src/sql/engine/expr/ob_expr_to_outfile_row.cpp index 3b7a965870..86092ec461 100644 --- a/src/sql/engine/expr/ob_expr_to_outfile_row.cpp +++ b/src/sql/engine/expr/ob_expr_to_outfile_row.cpp @@ -256,9 +256,9 @@ int ObExprToOutfileRow::print_field(char *buf, const int64_t buf_len, int64_t &p } else if (wchar == out_info.wchar_enclose_ || wchar == out_info.wchar_escape_) { OZ(out_info.escape_.print_plain_str_literal(buf, buf_len, pos, out_info.print_params_)); OZ(copy_string_to_buf(buf, buf_len, pos, code_point)); - } else if (!need_enclose && (wchar == out_info.wchar_field_ || - wchar == out_info.wchar_line_)) { - OZ(out_info.escape_.print_plain_str_literal(buf, buf_len, pos, out_info.print_params_)); + } else if (!need_enclose && (wchar == out_info.wchar_field_ || + wchar == out_info.wchar_line_)) { + OZ(out_info.escape_.print_plain_str_literal(buf, buf_len, pos, out_info.print_params_)); OZ(copy_string_to_buf(buf, buf_len, pos, code_point)); } else { OZ(copy_string_to_buf(buf, buf_len, pos, code_point)); diff --git a/src/sql/resolver/ddl/ob_ddl_resolver.cpp b/src/sql/resolver/ddl/ob_ddl_resolver.cpp index 037c998460..715875f55e 100644 --- a/src/sql/resolver/ddl/ob_ddl_resolver.cpp +++ b/src/sql/resolver/ddl/ob_ddl_resolver.cpp @@ -5592,9 +5592,9 @@ int ObDDLResolver::check_column_in_foreign_key_for_oracle( ret = OB_ALLOCATE_MEMORY_FAILED; SQL_RESV_LOG(ERROR, "failed to allocate memory", K(ret)); } else if (FALSE_IT(foreign_key_arg = new (tmp_ptr)ObDropForeignKeyArg())) { - } else if (FALSE_IT(foreign_key_arg->foreign_key_name_.assign_ptr( - foreign_key_info.foreign_key_name_.ptr(), - foreign_key_info.foreign_key_name_.length()))) { + } else if (OB_FAIL(deep_copy_str(foreign_key_info.foreign_key_name_, + foreign_key_arg->foreign_key_name_))) { + LOG_WARN("failed to deep copy foreign_key_name", K(ret), K(foreign_key_info)); } else if (OB_ISNULL(alter_table_stmt)) { ret = OB_ERR_UNEXPECTED; SQL_RESV_LOG(WARN, "alter table stmt should not be null", K(ret));