summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_misc.result
diff options
context:
space:
mode:
authorgluh@eagle.(none) <>2007-12-13 16:10:57 +0400
committergluh@eagle.(none) <>2007-12-13 16:10:57 +0400
commitd504588e7948b1f8ed815a78aeb263471a1b6635 (patch)
tree2c8c40e7d9d218e840756bed5ba5cbd07e40d13b /mysql-test/r/func_misc.result
parent4f5868114a1fe46f139f80d894dd28f1f7c180c1 (diff)
parent9df070ed7c0f2877e71572e59aec871f4bc039fd (diff)
downloadmariadb-git-d504588e7948b1f8ed815a78aeb263471a1b6635.tar.gz
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r--mysql-test/r/func_misc.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index eb0f2553cb0..745a340ec94 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -212,6 +212,11 @@ test
SELECT NAME_CONST('test', 'test');
test
test
+CREATE TABLE t1 (a int);
+INSERT INTO t1 VALUES (5), (2);
+SELECT NAME_CONST(x,2) FROM (SELECT a x FROM t1) t;
+ERROR HY000: Incorrect arguments to NAME_CONST
+DROP TABLE t1;
CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES (), (), ();
SELECT NAME_CONST(a, '1') FROM t1;