diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-08-23 18:27:34 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-08-23 18:27:34 -0600 |
| commit | 05a42ef6f9343292631c40e70d3912a06ce31050 (patch) | |
| tree | 57efdcdfbba3e71df7cf8f5fd36887c73eeb41bb /mysql-test/r/func_misc.result | |
| parent | beceb8f43c19f49c129bb48cf895cb0cbe1854c5 (diff) | |
| parent | f23adec9cda11eef6982021576a33beab0c930bc (diff) | |
| download | mariadb-git-05a42ef6f9343292631c40e70d3912a06ce31050.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50
into siva.hindu.god:/usr/home/tim/m/bk/beef-51
mysql-test/r/func_misc.result:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_misc.result')
| -rw-r--r-- | mysql-test/r/func_misc.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 10d20c001f1..f383a717a85 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -87,6 +87,10 @@ SELECT IS_USED_LOCK('bug16501'); IS_USED_LOCK('bug16501') NULL DROP TABLE t1; +select export_set(3, _latin1'foo', _utf8'bar', ',', 4); +export_set(3, _latin1'foo', _utf8'bar', ',', 4) +foo,foo,bar,bar +End of 4.1 tests create table t1 as select uuid(), length(uuid()); show create table t1; Table Create Table @@ -130,3 +134,4 @@ timediff(b, a) >= '00:00:03' drop table t2; drop table t1; set global query_cache_size=default; +End of 5.0 tests |