Merge remote-tracking branch 'upstream/feature/plcsql-p1n' into plcsq…

…l-p1n-CBRD-25704
CUBRID · Dec 4, 2024 · c5b23af · c5b23af
2 parents 09d595a + 10fcab1
commit c5b23af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/object/class_object.c b/src/object/class_object.c
@@ -3007,6 +3007,11 @@ classobj_make_index_filter_pred_info (DB_SEQ * pred_seq)
     {
       goto error;
     }
+
+  filter_predicate->pred_string = NULL;
+  filter_predicate->pred_stream = NULL;
+  filter_predicate->att_ids = NULL;
+
   if (val_str_len > 0)
     {
       filter_predicate->pred_string = (char *) db_ws_alloc (val_str_len + 1);

diff --git a/src/query/string_opfunc.c b/src/query/string_opfunc.c
@@ -8874,11 +8874,11 @@ qstr_grow_string (DB_VALUE * src_string, DB_VALUE * result, int new_size)
     }
   if (QSTR_IS_NATIONAL_CHAR (src_type))
     {
-      result_type = DB_TYPE_NCHAR;
+      result_type = DB_TYPE_VARNCHAR;
     }
   else
     {
-      result_type = DB_TYPE_CHAR;
+      result_type = DB_TYPE_VARCHAR;
     }
 
   codeset = db_get_string_codeset (src_string);