From 4028710cbf50fc79a5b17e50a4cba8b39029f886 Mon Sep 17 00:00:00 2001 From: obdev Date: Tue, 25 Oct 2022 10:52:36 +0800 Subject: [PATCH] fix mysqltest --- deps/oblib/src/lib/charset/ob_ctype_os.cc | 2 +- src/sql/engine/expr/ob_expr_nlssort.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/oblib/src/lib/charset/ob_ctype_os.cc b/deps/oblib/src/lib/charset/ob_ctype_os.cc index db547bef3..dfaf7ee8c 100644 --- a/deps/oblib/src/lib/charset/ob_ctype_os.cc +++ b/deps/oblib/src/lib/charset/ob_ctype_os.cc @@ -48,7 +48,7 @@ ob_convert_internal(char *to, uint32 to_length, error_num++; } else { // Not enough characters - if (!trim_incomplete_tail && cnvres != OB_CS_TOOSMALL) { + if (!trim_incomplete_tail && (const uchar*) from < from_end) { error_num++; from++; wc= replaced_char; diff --git a/src/sql/engine/expr/ob_expr_nlssort.cpp b/src/sql/engine/expr/ob_expr_nlssort.cpp index 25165ac39..838a95b2d 100644 --- a/src/sql/engine/expr/ob_expr_nlssort.cpp +++ b/src/sql/engine/expr/ob_expr_nlssort.cpp @@ -105,7 +105,7 @@ int ObExprNLSSort::convert_to_coll_code(ObEvalCtx &ctx, } else { to_str.assign_ptr(conv_buf, result_len); } - LOG_DEBUG("charset convert", K(from_str), K(from_type), K(to_str), K(result_len)); + LOG_DEBUG("charset convert", KPHEX(from_str.ptr(), from_str.length()), K(from_type), K(to_type), KPHEX(to_str.ptr(), to_str.length()), K(result_len)); } else { to_str.assign_ptr(from_str.ptr(), from_str.length()); }