bzr commit into mysql-5.0-bugteam branch (epotemkin:2859)

[Evgeny Potemkin]

#At file:///work/bzrroot/mysql-5.0-bugteam/ based on revid:epotemkin@stripped

 2859 Evgeny Potemkin	2009-12-03 [merge]
      Auto-merged.

    modified:
      mysql-test/r/ps.result
      mysql-test/t/ps.test
=== modified file 'mysql-test/r/ps.result'
--- a/mysql-test/r/ps.result	2009-12-01 18:28:45 +0000
+++ b/mysql-test/r/ps.result	2009-12-03 13:15:20 +0000
@@ -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.

=== modified file 'mysql-test/t/ps.test'
--- a/mysql-test/t/ps.test	2009-12-01 18:28:45 +0000
+++ b/mysql-test/t/ps.test	2009-12-03 13:15:20 +0000
@@ -1982,6 +1982,7 @@ create view v1 AS select 1 as a from t1 
 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 #
 


Attachment: [text/bzr-bundle] bzr/[e-mail]