hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix mysqltest

Browse Source
This commit is contained in:
obdev 2022-10-25 10:52:36 +08:00 committed by wangzelin.wzl
parent 985827f900
commit 4028710cbf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/lib/charset/ob_ctype_os.cc vendored
View File

@ -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;

2
src/sql/engine/expr/ob_expr_nlssort.cpp
View File

@ -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());
}