summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
authorunknown <bar@gw.udmsearch.izhnet.ru>2002-05-17 16:29:52 +0500
committerunknown <bar@gw.udmsearch.izhnet.ru>2002-05-17 16:29:52 +0500
commit8bee96ab0ad02e45bb4652f6878173d030642051 (patch)
treee4f1191a52998c24839a96bb95784af36d1f03d0 /sql/sql_string.cc
parentb043f06666c278a4277e7d35b1bff418d45708c2 (diff)
downloadmariadb-git-8bee96ab0ad02e45bb4652f6878173d030642051.tar.gz
Now string values are created and filled with charset field
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r--sql/sql_string.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index cf9e9f62507..b222d3394eb 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -586,6 +586,7 @@ String *copy_if_not_alloced(String *to,String *from,uint32 from_length)
return from; // Actually an error
if ((to->str_length=min(from->str_length,from_length)))
memcpy(to->Ptr,from->Ptr,to->str_length);
+ to->str_charset=from->str_charset;
return to;
}