summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-11-15 14:37:40 +0200
committerunknown <bell@sanja.is.com.ua>2004-11-15 14:37:40 +0200
commitb685909d6a9e928885ee3e8fb266077718660f3e (patch)
treedebcd49064caf980c1c042aedcc8a3e1c7af0b30 /mysql-test
parentfe37a1472c22b0a48244b932664925cad68f3e96 (diff)
downloadmariadb-git-b685909d6a9e928885ee3e8fb266077718660f3e.tar.gz
moved procedure list initialization (BUG#6517)
mysql-test/r/subselect.result: Subselect in non-select command just after connection mysql-test/t/subselect.test: Subselect in non-select command just after connection sql/sql_lex.cc: moved procedure initialization sql/sql_parse.cc: moved procedure initialization
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/subselect.result1
-rw-r--r--mysql-test/t/subselect.test7
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 32d482f5a32..9c8a237468a 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -1990,3 +1990,4 @@ ac
700
NULL
drop tables t1,t2;
+set @got_val= (SELECT 1 FROM (SELECT 'A' as my_col) as T1 ) ;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index e0f6fcbf515..19803f6e3ba 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -1282,3 +1282,10 @@ INSERT INTO `t2` VALUES (6,5,12,7,'a'),(12,0,0,7,'a'),(12,1,0,7,'a'),(12,5,5,7,'
SELECT b.sc FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
SELECT b.ac FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
drop tables t1,t2;
+
+#
+# Subselect in non-select command just after connection
+#
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+connection root;
+set @got_val= (SELECT 1 FROM (SELECT 'A' as my_col) as T1 ) ;