cherry-pick bug fix in 3.1

2021-07-21 23:46:35 +08:00
parent d49f1baf7d
commit 7fb21bbbe7
23 changed files with 450 additions and 208 deletions
--- a/src/share/object/ob_obj_cast.cpp
+++ b/src/share/object/ob_obj_cast.cpp
@ -198,6 +198,8 @@ static int convert_string_collation(const ObString& in, const ObCollationType in
      ObCharset::charset_type_by_coll(out_collation) == CHARSET_BINARY ||
      (ObCharset::charset_type_by_coll(in_collation) == ObCharset::charset_type_by_coll(out_collation))) {
    out = in;
+  } else if (in.empty()) {
+    out.reset();
  } else {
    char* buf = NULL;
    const int32_t CharConvertFactorNum = 4;