diff options
author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-17 16:29:52 +0500 |
---|---|---|
committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-17 16:29:52 +0500 |
commit | 8bee96ab0ad02e45bb4652f6878173d030642051 (patch) | |
tree | e4f1191a52998c24839a96bb95784af36d1f03d0 /sql/sql_test.cc | |
parent | b043f06666c278a4277e7d35b1bff418d45708c2 (diff) | |
download | mariadb-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_test.cc')
-rw-r--r-- | sql/sql_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 43c24da85a2..0bc1feed839 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -33,7 +33,7 @@ print_where(COND *cond,const char *info) if (cond) { char buff[256]; - String str(buff,(uint32) sizeof(buff)); + String str(buff,(uint32) sizeof(buff), default_charset_info); str.length(0); cond->print(&str); str.append('\0'); @@ -99,7 +99,8 @@ void print_cached_tables(void) void TEST_filesort(SORT_FIELD *sortorder,uint s_length, ha_rows special) { char buff[256],buff2[256]; - String str(buff,sizeof(buff)),out(buff2,sizeof(buff2)); + String str(buff,sizeof(buff),default_charset_info); + String out(buff2,sizeof(buff2),default_charset_info); const char *sep; DBUG_ENTER("TEST_filesort"); |