diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-08-23 18:24:59 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-08-23 18:24:59 -0600 |
| commit | f23adec9cda11eef6982021576a33beab0c930bc (patch) | |
| tree | eb0ec8945cf0558b5b9965a7af850038c7ba2f73 /mysql-test/r/func_misc.result | |
| parent | 07369d5a8126843efb741e1183c449ac1056895d (diff) | |
| parent | b2a0d025e3f3dc2a8e9ab83634f542d50c4f99a8 (diff) | |
| download | mariadb-git-f23adec9cda11eef6982021576a33beab0c930bc.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
into siva.hindu.god:/usr/home/tim/m/bk/beef-50
mysql-test/r/func_misc.result:
Manual merge
mysql-test/t/func_misc.test:
Manual merge
sql/item_func.h:
Manual merge
sql/item_strfunc.cc:
Manual merge
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 33e642c74c4..f0262acd71e 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 |