From: Jon Olav Hauglid
Date: September 23 2010 9:13am
Subject: bzr commit into mysql-5.5-runtime branch (jon.hauglid:3142) Bug#56422
List-Archive: http://lists.mysql.com/commits/118914
X-Bug: 56422
Message-Id: <201009230913.o8N8dZFN029922@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7587087101873511414=="

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

#At file:///export/home/x/mysql-5.5-runtime-test/ based on revid:jon.hauglid@stripped

 3142 Jon Olav Hauglid	2010-09-23
      Followup to Bug #56422 CHECK TABLE run when the table is locked
                             reports corruption along with timeout
      
      This patch updates the result file for the
      parts.partition_special_innodb test case which was, by mistake,
      not updated in the original patch.

    modified:
      mysql-test/suite/parts/r/partition_special_innodb.result
=== modified file 'mysql-test/suite/parts/r/partition_special_innodb.result'
--- a/mysql-test/suite/parts/r/partition_special_innodb.result	2010-08-13 07:50:25 +0000
+++ b/mysql-test/suite/parts/r/partition_special_innodb.result	2010-09-23 09:13:21 +0000
@@ -242,7 +242,7 @@ ERROR HY000: Lock wait timeout exceeded;
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	Error	Lock wait timeout exceeded; try restarting transaction
-test.t1	check	error	Corrupt
+test.t1	check	status	Operation failed
 UNLOCK TABLES;
 DROP TABLE t1;
 CREATE TABLE t2 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f INT )


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-runtime-test/
# testament_sha1: fc7f2d9803dce0b4895aee0b4f97396ecb4fd538
# timestamp: 2010-09-23 11:13:24 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   mpy5ty4vmw0k5j19
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS2aZ0gAAYR/gAAwCABYZ//3
e1yEAL////BQBA17223nt67r3nrz09bwlITTImmKb1U/aApqbIn6o9Q9Gp6nqYZEwJSTQaMU8U00
Gk0zU0AaAAGhoJRNBT9JTwmKj2lPUMn5UAbSAaBoyDJqI1TeqfpHqn6U03qh6jTQNAGgAaAJKnoT
SYSe1RpphqYmRkBkAAGnpTx515b1eXgPxylnTVjSgRWLwXey2jGawG/xlvD6KUo8uScIzUqQhmZe
PDurzXGzRoZHk77Bpti3dCP6ixzh2sTsorz6aVjH32Ol+GN596LUhrL2PnPUQxEgyjeSJGvrpFW1
4ISongkVCL5hsk+qcvvFRea4YQ9gTMPYcVDtZFAogchefp1IUe+z9OidwiwEgUYYMCNV4zCrtUvM
bLj1WL3CUQR/I2aLiaZJpyvdQmv2Rd5Vup7bFktvgSzMIwj04UJKseYdjxZ3kbk1627EVYJ2CgmY
KQOLOHugjXHCYO0N4YqRM5FI3KMjIOru4YZ6WiQQO4doaRHGxLtRLTGiM/1gtLU7G8J5Lm4P0lIm
SfceSR9OJlo9zYzVZx5XVW6pGlhMZYFmGIebGi7IUDmoUqYOMjuwSdcRsXgqZyhrXrfemgprEpUg
SwErmbz0FSwsVS+67oL5jtfFZIQoxSTItFmRCdF6y/7aJs62KNnHBsgh6zuFKFeO+gV0bzz9JVry
Z/lT6dU2ATI3He8gE0tDwz5zMbo821IruscG2e/sRws6FdKR4Oz1khAW5T8ICFlzjM25mZAiMulG
/HAs7LtYPjQModxCP4MLtGmabYxCC4zIh4ohJ8RKipRr3W7KLq8Ip8CiMbR5bkEjqYnDKMTsuKUF
OrqRUix2bSBG52fG7LPnzEtRrdfhrVNB4T46B1wLpx4qoX2xsVRtLW3xNKsnshZaDpGosb9xcNcd
m+ypBFmgCxVNsZFlFZjReMoeZSFh8xxzYplp2E2t60IockaacFqOQOgQ4KX5Os3apKJTEMrtDSj5
fyYQ2QUbCOMON4YzEUmvWEnHTKMkxcCgmh3BtywlBjo2JVQn9OQpdXXim5NJaywOB2/MDi0O0k8J
w36iFKQyz3JE+Xu58nLCwcWtOIajw1TS11gpXzTYlI3J09KM0poud0BkQFq8AZVqUY2N7iTUdUkq
Kn59PGfXsZ2GVe/iCeFqWiCmpSDbJ5WEOCIRC5aO7ydI45OtukgNzKUkDbz5+SkcccK6224UuXeI
6OYCcntqkERNYRQ8L8bd7E3cM4YNGoQUWefDCKY7WcirVIplHQjgdC3uC7h1fTS3eDaBzC6rGLeb
SAtQU8ksKNF1bHegfmYvDrk6ilxfxMQpAJWU0slccabgmFdiloOEgVJ0Jphp2zogy9RWdTRa4RtR
kRIJcHcmpPQi8JDX6d1iedZRtUdSVJVDjWP3uh3iYG2r5F3JFOFCQLZpnSA=


--===============7587087101873511414==--