diff options
author | unknown <monty@mysql.com> | 2005-02-28 12:18:39 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-02-28 12:18:39 +0200 |
commit | 45a26d449d157fb2f5c4b5ae871eb98728d9ee55 (patch) | |
tree | f466a4f954ca82d8aae5e4d3ab0a985e7fdce2f7 /mysql-test/r/type_set.result | |
parent | 108702a34e37bae22f117a3a7e18e7cead3e63c8 (diff) | |
parent | 8e3addf9284742a6b29fb3016b8c612dfd1a5778 (diff) | |
download | mariadb-git-45a26d449d157fb2f5c4b5ae871eb98728d9ee55.tar.gz |
merge with 4.1
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/type_set.result:
Auto merged
mysys/default.c:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-simple.c:
Auto merged
include/mysql_com.h:
Merge
sql/filesort.cc:
merge
Diffstat (limited to 'mysql-test/r/type_set.result')
-rw-r--r-- | mysql-test/r/type_set.result | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/type_set.result b/mysql-test/r/type_set.result index 36783cbf199..fdda4aca25c 100644 --- a/mysql-test/r/type_set.result +++ b/mysql-test/r/type_set.result @@ -29,6 +29,12 @@ a A a,A a,A +select s from t1 order by concat(s); +s +A +a +a,A +a,A drop table t1; CREATE TABLE t1 (c set('ae','oe','ue','ss') collate latin1_german2_ci); INSERT INTO t1 VALUES ('ä'),('ö'),('ü'),('ß'); @@ -47,4 +53,16 @@ ss ss ae,oe,ue,ss ae,oe,ue,ss +SELECT c FROM t1 ORDER BY concat(c); +c +ae +ae +ae,oe,ue,ss +ae,oe,ue,ss +oe +oe +ss +ss +ue +ue DROP TABLE t1; |