From: Date: February 20 2009 4:56pm
Subject: bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:2812)
 Bug#38719 Bug#40003
List-Archive: http://lists.mysql.com/commits/67051
X-Bug: 38719,40003
Message-Id: <20090220155644.A06151DE22AA@witty.localhost>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_OfcnBKwKTYUo35DoVfybTA)"

--Boundary_(ID_OfcnBKwKTYUo35DoVfybTA)
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/mattiasj/clones/bzrroot/topush-51-bugteam_2/ based on revid:mattias.jonsson@stripped

 2812 Mattias Jonsson	2009-02-20
      Backport of patch for bug#40003 from 6.0 to 5.1,
      related to the backport of the patch for bug#38719
     @ sql/ha_partition.cc
        bug#40003, archive does not handle dup_key.

    modified:
      mysql-test/t/innodb_bug42419.test
      sql/ha_partition.cc
=== modified file 'mysql-test/t/innodb_bug42419.test'
--- a/mysql-test/t/innodb_bug42419.test	2009-02-20 09:12:06 +0000
+++ b/mysql-test/t/innodb_bug42419.test	2009-02-20 15:56:32 +0000
@@ -3,6 +3,7 @@
 # Bug#42419 Server crash with "Pure virtual method called" on two concurrent connections
 #
 
+--source include/not_embedded.inc
 --source include/have_innodb.inc
 
 let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1);

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2009-01-07 22:30:10 +0000
+++ b/sql/ha_partition.cc	2009-02-20 15:56:32 +0000
@@ -4928,10 +4928,11 @@ int ha_partition::info(uint flag)
       This flag is used to get index number of the unique index that
       reported duplicate key
       We will report the errkey on the last handler used and ignore the rest
+      Note: all engines does not support HA_STATUS_ERRKEY, so set errkey.
     */
+    file->errkey= errkey;
     file->info(HA_STATUS_ERRKEY);
-    if (file->errkey != (uint) -1)
-      errkey= file->errkey;
+    errkey= file->errkey;
   }
   if (flag & HA_STATUS_TIME)
   {


--Boundary_(ID_OfcnBKwKTYUo35DoVfybTA)
MIME-version: 1.0
Content-type: text/bzr-bundle;
 name="bzr/mattias.jonsson@stripped";
 charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/mattias.jonsson@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped
# target_branch: file:///Users/mattiasj/clones/bzrroot/topush-51-\
#   bugteam_2/
# testament_sha1: cb24a215a85cd742fd7147cb96cb7117789c429b
# timestamp: 2009-02-20 16:56:44 +0100
# source_branch: file:///Users/mattiasj/clones/bzrroot/topush-51-\
#   bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   mvvj4orojjjrgqhw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfrUIKQAAnHfgFAQWWf//3Jb
HiC////wUAV4k3oSZ3BVVXU613hJTU0GoDU9MmINMiZTyT0QBo0aNGgSSIaaNIep6TVP0mTakxBt
RoAAAASJApPQZExTynoRoaDRoAMZNQA5pkYCMATCMTAAAAmIwElBNEzTSp+TTKMnqMmpsUzUxDNR
oANMs1n0S3F+07Jd2nw1myQUTTC95Kads6CU9tjNeOkT8WPOgou/FqWcuGNpsn90rq8axk54lgwh
6GaaRXfhi5NXl5ftxM8UfC3US/r3nhsNdu+s7DLihkkU3wNmnPJEET2KsWNv7hbZm1ZNmzFIbh2t
u6xJs1Fb0B5q7Avny+W/8mjQoMOBX30lxj28FqhEtIEka2wt6xW735YoP4JBXoQudbVotW2Y97aJ
3ZNvLcBDR65U1TirtQgpJJFmsrAYlMmTUQipSScYKdSggspTHnVvIGwpIRJhnYRjLWbh4Y8VHoAh
2RNTXTXrcWpo/2VgTlli3XqqM2mEIr9ERgSNm6ooztBgFzTJIN6uGSMaqCVsJ2VwIv2qA5xQrxaJ
aj76HJXRL8I/h1xhenFrsAPzVa0BoPHHDZAsVh6oYQJD8iRsxy0vjtOnVSvWXpyiqx5LJaPqQ9Ka
iNygtxgTNCoofrc2a61q1X5yfvva7EqtUjf32WxYrIGZHdAv/jyRgQAmTjFbKgHGYaisYqjAzjyZ
RMbijnUJ7Z729U3QTXDJEioDHHNmHlhuaToke0DVf1+qyxgSVykVKmLl3+x/9Ogpt5sEyeo3hZ0n
KBW0LJlCj1NAM0HPIpWHgHcCW4eQ4DDx5yA6qpSY2bMMWZTkmEqNUvzIjpMCfuMtYS+bVTrorF/t
lA1rOsYvP+FybpViTq5ekoTOlpH84X2bGx4cI+HHqP3k8mlk9fX0zR+L381qnKEwxrcjuQ+v3SWu
DAvHij4jI7+w7Cvusos4ER712I5ZT3BbNYZ4VoVAlhaMHHaz+uQrfO0j3ETOTpnE7VZGA4g7bMfL
rXbhvQeAXgOqOcuNRyR4Gh5ypyKeiU+AHnjMwg2Ile+w+AzPtMcWmakMIBQOeB4q81FWik5pYGlX
+S3EqFIC8sZkttF6i5qJWnl0kB5y3TaLzeatWubeYXBUP8yDLQeih+Qnafse/Ph+NbcbGLE4Xasd
OWyU+Z43is2lw7TqVIMpJIHIuE+Glm0NA5po4DzObDJWK30NF+vcYPXLVaRCf0Wz2KWxl4LeBAvo
2qH7mgudRrgV9pg7DoA1wuatemM05i33rSk87r2iTMLeCCgCY1q0ysAtSIzP1dYjnPLTS703xzV4
0OAtQMjp1ed9Mirq9qR3pF6FlwcuOYry6GBqqTkTFkVZ1EB4dIFUQO+N6RyOPKGLIyrbdmSU3Yv1
Vc43DA4yqidTBJHdaY9de+ihS9U/avFk9LBWCTPFMBG0H8YtEx7U26geutUAtKTyneJXIiwmVefJ
nboSTSOzAeqgLk3SkqahDEJgbP9sQoJSkMQxOvW0HqK9btdaVN+1ZcuQdqKh3fK1Xiv018xsCzDB
MWx9E+lTVE6/O004pyPDnsr8HNwE3Zm1k+CuhwReqel1GXGyYrUVJmZEQDWuUlEITiw3GPUp7r40
SWNdCBnZcELRLs8a3NF7cJLESZD0f4Si6eVdHDSexr7bDj3OJ4nAKB490HXcVRIGPae6iAlIeYIa
h7jjFFa7mVjBC4S3qoG54daWlSuEq2MNNoWpiCvkqj61oNKl5YLw5t0iN1qgiphhpkwREWhYoXtw
VnyNCI6mEHcC7kinChIfWoQUgA==


--Boundary_(ID_OfcnBKwKTYUo35DoVfybTA)--