summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp.test
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2011-08-09 12:03:29 +0400
committerRamil Kalimullin <ramil@mysql.com>2011-08-09 12:03:29 +0400
commite557d8a5fd2cc88239f1414acc0f6a38dea91acd (patch)
treedc0d028fe3a0c606151fe9522068bfe1a88e8e9e /mysql-test/t/sp.test
parent50af230e655b773bd1024c8f575ac923ceb7b89b (diff)
parent5962cadcfae4f8b7842578ab308798a9b5295a32 (diff)
downloadmariadb-git-e557d8a5fd2cc88239f1414acc0f6a38dea91acd.tar.gz
Manual merge from mysql-5.5.
Diffstat (limited to 'mysql-test/t/sp.test')
-rw-r--r--mysql-test/t/sp.test31
1 files changed, 30 insertions, 1 deletions
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index b687e3ae6aa..07b8c065be4 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -8376,9 +8376,10 @@ SET @@GLOBAL.init_connect= @old_init_connect;
DROP PROCEDURE p2;
DROP PROCEDURE p5;
+
--echo #
--echo # Bug#11840395 (formerly known as bug#60347):
---echo # The string "versiondata" seems to be 'leaking' into the schema name space
+--echo # The string "versiondata" seems
--echo # to be 'leaking' into the schema name space
--echo #
--disable_warnings
@@ -8394,6 +8395,34 @@ call mixedCaseDbName.tryMyProc();
select mixedCaseDbName.tryMyFunc();
DROP DATABASE mixedCaseDbName;
+
+--echo #
+--echo # Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUNCTION IN WHERE C
+--echo #
+
+CREATE TABLE t1 (a INT, b INT, KEY(b));
+CREATE TABLE t2 (c INT, d INT, KEY(c));
+INSERT INTO t1 VALUES (1,1),(1,1),(1,2);
+INSERT INTO t2 VALUES (1,1),(1,2);
+
+DELIMITER $;
+
+CREATE FUNCTION f1() RETURNS INT DETERMINISTIC
+BEGIN
+ DECLARE a int;
+ -- SQL statement inside
+ SELECT 1 INTO a;
+ RETURN a;
+END $
+
+DELIMITER ;$
+
+SELECT COUNT(DISTINCT d) FROM t1, t2 WHERE a = c AND b = f1();
+
+DROP FUNCTION f1;
+DROP TABLE t1, t2;
+
+
--echo # ------------------------------------------------------------------
--echo # -- End of 5.1 tests
--echo # ------------------------------------------------------------------