summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_misc.result
diff options
context:
space:
mode:
authorsvoj@june.mysql.com <>2008-02-20 21:22:21 +0400
committersvoj@june.mysql.com <>2008-02-20 21:22:21 +0400
commit33ad5a480f3545b60508f531b17055e5bf1e36f9 (patch)
tree6acad6c121b29c659045786269c14df37a8ee208 /mysql-test/r/func_misc.result
parentd2ad8286a0e3abb63dd7789c9077b628467ff3e4 (diff)
parent921e1cc4bb217b74f29e3e0b28df253df34c8d83 (diff)
downloadmariadb-git-33ad5a480f3545b60508f531b17055e5bf1e36f9.tar.gz
Merge mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.1-engines
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r--mysql-test/r/func_misc.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 745a340ec94..766b0277955 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -230,6 +230,9 @@ 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
select connection_id() > 0;
connection_id() > 0