From: Mattias Jonsson
Date: October 5 2010 10:17am
Subject: bzr commit into mysql-trunk-bugfixing branch (mattias.jonsson:3285)
List-Archive: http://lists.mysql.com/commits/119973
Message-Id: <201010051018.o954xq2k000818@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5096295240108075563=="

--===============5096295240108075563==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mattiasj/mysql-bzr/topush-trunk-bugfixing/ based on revid:mattias.jonsson@stripped

 3285 Mattias Jonsson	2010-10-05
      Pre-push fix

    modified:
      mysql-test/r/not_partition.result
=== modified file 'mysql-test/r/not_partition.result'
--- a/mysql-test/r/not_partition.result	2010-08-16 12:53:30 +0000
+++ b/mysql-test/r/not_partition.result	2010-10-05 10:17:45 +0000
@@ -3,7 +3,7 @@ FLUSH TABLES;
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'partition'
 TRUNCATE TABLE t1;
-ERROR 42000: Unknown storage engine 'partition'
+ERROR 42S02: Table 'test.t1' doesn't exist
 ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	Error	Unknown storage engine 'partition'


--===============5096295240108075563==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   8des9p1p4xa4zf2p
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   bugfixing/
# testament_sha1: 1c58a59c108cfa049a8c572361cec807b3d5b048
# timestamp: 2010-10-05 12:17:57 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/b55784-trunk-bf/
# base_revision_id: mattias.jonsson@stripped\
#   k34ou3cgfnm9b2n2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfx8FBcAAXDfgAAQUOP/91IS
3AC////wUAN673dPJ3aZvIwSihGDUntIZMjE0xR6mj1GgeiANKJ5T1PNRtUep6QDQAAAAASRJoZE
MRlGCaT9QTJ6jRtRoMgikpmpGnoT0TynpBkA00NGRoGgSSjTU09AARMQNMIyBoAaYZHt66ug1960
bHmA832QHh5x0+WLDN09FdRSM3g5YO6c654GdPf96N6qgzdDrbQzAcUR+WovhMxDeJLG/ovSXL7m
O4sosq4pqXKVNXHLhpy0DkzykhaREIQJCDzmQRDEbTq1OTsxcPdKYsGQjqzvSDRMLAeexZxo+ZCi
+ivXPa5X0XMyngtdhMTnkV77x8Z4MXsJ2jXmNUQhZxinDZofaROsdkdQ3wxqHWxM0oEtugZJTZde
uM8KKobF4w7aCm1TVZhx4QDGoVJHqHya0m1JaQwW0W8WiQp7UGlapaFacihT5QoKuQQh70NK21tA
nAR9ULfXEkJRI95GIjMHgwmM53LBPoaKghfcIKUKyFAewuLLpI1aiRGTQE0pBk55ARpE1ttB1y2Y
Sg7FrLL9RZyFWZYs77L3wsal0SgUOmpaJUFNTP5mXfdLPKDHy9NkUiMmGZvV3n282/T06Y16ZIYM
fo4ywbuFhhz+929Ipn0kxRIG95VU7XAB4LMvpkjZsnVLtOwvtY9iY2BtjLpjEYbiRNL3ORKJmqqI
ZIhL+Rd3iX3+RKdiim1QVUcRbjHHOrpaMcyXY4LCFeeTdcPimORhypveHGPh4T5UDlWNzVgkq4aq
lk+nCg/kVGzbb+UegSyul8WFMBQteR7cWahNbYTieuFcBORNO3e04Pqm90gWHKm9gf0di0MzMEum
hZzGEQJsu7mmdqMVEWVhDX+Y1OrlTKsMkavmJNvDgkYXNarbg44hAISRhw1SSGN2vdnAdXTv7hD3
p+C6w6GYz77H0mg65RidVNFkJqYR0X6QvQTyVuK8Ug2pOGHROuou5QZTGFIr3/Kl8z71IDA6pOZx
97al2J0jpHNzRDmqSqVu6lttDHM+2jjZwVSS7viKPFW+F5WSksnuokoxudWlAKERR0VQsiNc0+IN
WuVXeTBZ97fyPAFN1YDJsyu73sVdGUYbFR5jNdXXkNXVEFnaaU6eYWBe6JSSgqjKrtOftmUGl236
ChRThMdWW2t5rFYSg9FJ2UyDxcuJLQUU2H+LuSKcKEh+PgoLgA==


--===============5096295240108075563==--