Auto-merged.

mysql-test/r/ps.result

@@ -1928,6 +1928,7 @@ execute stmt;
 a
 execute stmt;
 a
+deallocate prepare stmt;
 drop table t1;
 drop view v1;
 create table t1(a bigint);
@@ -1938,6 +1939,7 @@ execute stmt;
 1
 execute stmt;
 1
+deallocate prepare stmt;
 drop table t1,t2;
 #
 End of 5.0 tests.

mysql-test/t/ps.test

@@ -2000,6 +2000,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;
 
@@ -2009,6 +2010,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 #