diff options
author | unknown <hartmut@mysql.com> | 2006-04-07 11:23:55 +0200 |
---|---|---|
committer | unknown <hartmut@mysql.com> | 2006-04-07 11:23:55 +0200 |
commit | 7589de6c10d3b15c37ca038b4bd7451b73fca9ca (patch) | |
tree | 53b2a624f9e559d7dcebca903ec3ab83e2ccd93c /mysql-test/r/func_gconcat.result | |
parent | 040fc2d335bc8dc83b403562cde3c6e2e89c0e6a (diff) | |
parent | f7b039cc5060313390f31098b336d4fa811ab5f8 (diff) | |
download | mariadb-git-7589de6c10d3b15c37ca038b4bd7451b73fca9ca.tar.gz |
Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_gconcat.result')
-rw-r--r-- | mysql-test/r/func_gconcat.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index b0a6d91ee40..23a587ca3a7 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -626,3 +626,8 @@ latin1 latin1 drop table t1, t2, t3; set names default; +create table t1 (c1 varchar(10), c2 int); +select charset(group_concat(c1 order by c2)) from t1; +charset(group_concat(c1 order by c2)) +latin1 +drop table t1; |