summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2009-12-26 14:59:56 +0400
committerRamil Kalimullin <ramil@mysql.com>2009-12-26 14:59:56 +0400
commit732a6a9e36e54e53299ac6d4d53897e9223f4805 (patch)
tree38b8c71572e79a92c66391222d082edcf033aab1 /mysql-test
parent416df0eaada5b644931f5b3b15f897a376641a4d (diff)
parent7344b58c32c07df496c208dad5c1e11c304e8aac (diff)
downloadmariadb-git-732a6a9e36e54e53299ac6d4d53897e9223f4805.tar.gz
Auto-merge.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ps.result22
-rw-r--r--mysql-test/t/ps.test16
2 files changed, 38 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 8a19b9b17e1..6e017ec7253 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1916,4 +1916,26 @@ execute stmt;
deallocate prepare stmt;
drop table t1,t2;
#
+#
+# Bug #49570: Assertion failed: !(order->used & map)
+# on re-execution of prepared statement
+#
+CREATE TABLE t1(a INT PRIMARY KEY);
+INSERT INTO t1 VALUES(0), (1);
+PREPARE stmt FROM
+"SELECT 1 FROM t1 JOIN t1 t2 USING(a) GROUP BY t2.a, t1.a";
+EXECUTE stmt;
+1
+1
+1
+EXECUTE stmt;
+1
+1
+1
+EXECUTE stmt;
+1
+1
+1
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1;
End of 5.0 tests.
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 8f8e943913f..e207b0f154a 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -1996,4 +1996,20 @@ deallocate prepare stmt;
drop table t1,t2;
--echo #
+
+--echo #
+--echo # Bug #49570: Assertion failed: !(order->used & map)
+--echo # on re-execution of prepared statement
+--echo #
+CREATE TABLE t1(a INT PRIMARY KEY);
+INSERT INTO t1 VALUES(0), (1);
+PREPARE stmt FROM
+ "SELECT 1 FROM t1 JOIN t1 t2 USING(a) GROUP BY t2.a, t1.a";
+EXECUTE stmt;
+EXECUTE stmt;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1;
+
+
--echo End of 5.0 tests.