From: Evgeny Potemkin
Date: December 3 2009 1:15pm
Subject: bzr commit into mysql-5.0-bugteam branch (epotemkin:2851) Bug#48508
List-Archive: http://lists.mysql.com/commits/92677
X-Bug: 48508
Message-Id: <0KU2000E7VH1SNC0@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_LzeN17kd1NIi5+uvr+Tsgw)"

--Boundary_(ID_LzeN17kd1NIi5+uvr+Tsgw)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

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

 2851 Evgeny Potemkin	2009-12-03
      Bug#48508: Crash on prepared statement re-execution.
      
      Test case cleanup.
     @ mysql-test/r/ps.result
        Test case cleanup for bug#48508.
     @ mysql-test/t/ps.test
        Test case cleanup for bug#48508.

    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 #
 


--Boundary_(ID_LzeN17kd1NIi5+uvr+Tsgw)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/epotemkin@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/epotemkin@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: epotemkin@stripped
# target_branch: file:///work/bzrroot/48508-bug-5.0-bugteam/
# testament_sha1: e5d690cda3f4d3b19ef658a3284f5fc7ca028d84
# timestamp: 2009-12-03 16:15:32 +0300
# base_revision_id: epotemkin@stripped\
#   aw0uawt6c6gwi98c
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSVAPPAAAoHfgEAQWWP//1oA
RAC////wUAU57d3ByMWiNi3d05wkkjU9CMRTzKNmonqn6TEymTR6jyjyDKnqjam09RlAGTQaAAAa
ACREKU/TVP0E9Ggo9RtE9QaZNBkGhhoaAAADQAAAAAkkCaAmaJTwaTInlTymm9U9RtRiNf679evh
uBnj27H3ZVWdMMHNsa0qkoDgV4UzaXXB7/G7YvieobY2FNCXlS1xBnbY3hSk41lzHL/eRcv4V0HH
wf3ieGiMf1W4qCdbz3YnEHC77NObsdu20aVD4kLnO4gOt1bZQD9L+biepKRC2p84GZGR1j1Y5qPE
zAfAnnkWQQUMBPkEWjYxSjgQrwmAItLSCnMDpMTpcVaQdg0LqMiqWQtBQzVoKIOW1TI6pCeSJKb6
/gkdPyi/BXMA3uduxzrRgLK+aFVlG2dLCq6wC5VQ2JiAFgqD6GeaNzCtTMZMh8wsWoGQxkMlibAL
6gLfAIZC8qwbYZwmlgqEcYooMf7koVQwfxfjuAcBeOKpQWZ3KzImedkAKq7Mme7Eay+ckKS0FB4x
MY1XZVo800OXutJQRPsoqYrJNHFWLsy2KjK2oty4EEQkDnAXEJhKDEaiTaFfd5aeE/an1qKioVUu
PTI51qsPXUVxD5DkdSVDu9GSl8zYaHvvv1IFJlCvEb1cGhUbL9kHBc/OQFhJFpfkh20bYFp0sdhX
x1nMYLTkBmdmmgiRTrELBzDXRwPIB0iOAxi21GA4qYmvX8ANtrGkcBqKcYGq1kM5DUw0V9gsvsdf
fCXRqfpYgwOjjb3jITRj+V4d01iXakUiRKC9sY/PDrm0bybGZaCAHF3hN7DYSLgq8jmXHIzA9IHq
eRvrnnR4b0eF1kjQM40gu9qFco6pwQlMdyMV3RwmA+NQ8oPwmIm8rB5T5YFRggh56m7kc0fsSPYs
XmGRiciQb7eeMnVpvUSc+a9MSjsD2Ky0KvpUD5kQHhXQ4nFb1x271cdA6ocqG/XwaD07YaadzqES
hFr7kQRzPn9AjFdjxhSJN3oYK54BW88JhVMjpv5B8DgY0WUcI+gsTNUHdQAc1SIMg0SIlu9UvY1H
AlM5aMS8lAvIG1aF0PL2NZyWK33uMqlQ/QrLw5ea3jMlhQ2TMus1qHlMd3IcCemvHFJ2f4RqNO70
EWLLLgIk27mkF+3+cZjSpgNoGSDq89ul613Gq+q4rgtLUl8kQ5q+4AYN324CL1eimQcU4PJrCG2r
TvoJWc12AcG7oevPI3xSVdVS74B2efkS9CwmkwkwdQ5WQRDVOJtRY4CqxVUKO2h818gIW8Mr1vSV
2hoOdFWQGFA0oZUOXyvEglnjStikAxQXV6UMRjcLDIYgdplaCVjIUqpgG6goiFGVAXJj0aCBorPG
TZHsOiaKPT/6go02AzR8I0+si5k+KtJ2rJ0BQIMDUCOpTUb3eeIW0LjmiFnXNAzszhxWp2iI0LAQ
WAGLMEEOQ1t615uiycr7XnBcF48I2hCdpaT+wMng6MYQxSVOAdCQ6gOkS7kDq+tBcuDLIwa3B0R8
++J1YcBzoROmqyyLtnOt2xBx3KdF/O9EgE90wq1TZeMw2Kn1rMIPypMF2Aqipn1uiLqS/+LuSKcK
EgSoB54A


--Boundary_(ID_LzeN17kd1NIi5+uvr+Tsgw)--