summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorEvgeny Potemkin <epotemkin@mysql.com>2009-12-03 16:21:53 +0300
committerEvgeny Potemkin <epotemkin@mysql.com>2009-12-03 16:21:53 +0300
commit026541c662539657d75fed5e7e59326abd97cec3 (patch)
tree211960f133b45e02c285ecb5337f51d30f0598cf /mysql-test
parentd969cbc5783a88406428a94ae4a01036e742178c (diff)
parent8fa282cc68b4f7abac8b327935cb449f7c2e7558 (diff)
downloadmariadb-git-026541c662539657d75fed5e7e59326abd97cec3.tar.gz
Auto-merged.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ps.result2
-rw-r--r--mysql-test/t/ps.test2
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index e7894388494..8a19b9b17e1 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1902,6 +1902,7 @@ execute stmt;
a
execute stmt;
a
+deallocate prepare stmt;
drop table t1;
drop view v1;
create table t1(a bigint);
@@ -1912,6 +1913,7 @@ execute stmt;
1
execute stmt;
1
+deallocate prepare stmt;
drop table t1,t2;
#
End of 5.0 tests.
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 6134efb5c5c..8f8e943913f 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -1982,6 +1982,7 @@ create view v1 AS select 1 as a from t1 where b;
prepare stmt from "select * from v1 where a";
execute stmt;
execute stmt;
+deallocate prepare stmt;
drop table t1;
drop view v1;
@@ -1991,6 +1992,7 @@ insert into t2 values (null);
prepare stmt from "select 1 from t1 join t2 on a xor b where b > 1 and a =1";
execute stmt;
execute stmt;
+deallocate prepare stmt;
drop table t1,t2;
--echo #