diff options
| author | unknown <antony@pcg5ppc.xiphis.org> | 2008-03-07 13:41:11 -0800 |
|---|---|---|
| committer | unknown <antony@pcg5ppc.xiphis.org> | 2008-03-07 13:41:11 -0800 |
| commit | 1e8b11c6565516f53375cbeed1641157f1d1981b (patch) | |
| tree | e851576a5b589c485ef78c988888f15462c1446d /mysql-test/r/func_misc.result | |
| parent | 4d09306dd19820a742b003417d83f76f5d3633f3 (diff) | |
| parent | e78f628499f52b57f1481950c15a433da556672d (diff) | |
| download | mariadb-git-1e8b11c6565516f53375cbeed1641157f1d1981b.tar.gz | |
Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines
into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_misc.result')
| -rw-r--r-- | mysql-test/r/func_misc.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 4f6b6d3a0d8..fa9ca3539d6 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -225,4 +225,7 @@ select min(a) from t1 group by inet_ntoa(a); min(a) -2 drop table t1; +SELECT NAME_CONST('var', 'value') COLLATE latin1_general_cs; +NAME_CONST('var', 'value') COLLATE latin1_general_cs +value End of 5.0 tests |