diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
| commit | a72f90bc43a809e6678e1343a1ee760878061be3 (patch) | |
| tree | 16fe2efa0a3d5e40e00972a1dc3bc4e13f71170c /mysql-test/t/ps.test | |
| parent | ba678eef7de4a8c5fbea07928b87fef84765f22b (diff) | |
| parent | b38ef2b5f7bc231b63b770c28688ee9f0109c88b (diff) | |
| download | mariadb-git-a72f90bc43a809e6678e1343a1ee760878061be3.tar.gz | |
Merge next-mr -> next-4284.
mysql-test/t/disabled.def:
Restore disabled ssl tests: SSL certificates were updated.
Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
Disable parsing of the test case for Bug#47343,
the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
Update results (CREATE TABLE IF NOT EXISTS takes
into account existence of the temporary table).
Diffstat (limited to 'mysql-test/t/ps.test')
| -rw-r--r-- | mysql-test/t/ps.test | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index a883c00819b..dcea4d9828b 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -2014,6 +2014,22 @@ 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. # |