From: Mattias Jonsson
Date: April 11 2011 4:09pm
Subject: bzr commit into mysql-5.1 branch (mattias.jonsson:3654) Bug#11867664
List-Archive: http://lists.mysql.com/commits/135216
X-Bug: 11867664
Message-Id: <201104111609.p3BG9hEV009835@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0996766446=="

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

#At file:///C:/ade/mysql-bzr/b11867664-51/ based on revid:sven.sandberg@stripped

 3654 Mattias Jonsson	2011-04-11
      backport of Bug#11867664 from mysql-5.5
      
       3381 Mattias Jonsson	2011-03-18
            Bug#11867664:  SERVER CRASHES ON UPDATE WITH JOIN ON PARTITIONED TABLE
            
            Regression from bug#11766232.
            m_last_part could be set beyond the last partition.
            Fixed by only setting it if within the limit.
            Also added check in print_error.

    modified:
      sql/ha_partition.cc
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2011-01-24 12:41:44 +0000
+++ b/sql/ha_partition.cc	2011-04-11 16:09:23 +0000
@@ -4317,7 +4317,8 @@ int ha_partition::index_read_idx_map(uch
           break;
       }
     }
-    m_last_part= part;
+    if (part <= m_part_spec.end_part)
+      m_last_part= part;
   }
   else
   {
@@ -6237,7 +6238,14 @@ void ha_partition::print_error(int error
   {
     /* In case m_file has not been initialized, like in bug#42438 */
     if (m_file)
+    {
+      if (m_last_part >= m_tot_parts)
+      {
+        DBUG_ASSERT(0);
+        m_last_part= 0;
+      }
       m_file[m_last_part]->print_error(error, errflag);
+    }
     else
       handler::print_error(error, errflag);
   }


--===============0996766446==
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\
#   763pw4fngx50k9kq
# target_branch: file:///C:/ade/mysql-bzr/b11867664-51/
# testament_sha1: abd7312b01b3142dcbbf8dea818473885b89ee50
# timestamp: 2011-04-11 18:09:31 +0200
# base_revision_id: sven.sandberg@stripped\
#   7k8jfmazuu0qdqse
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRbxQPEAAe5fgFQwWGP//3/3
34C////6UARtLKvY7nd1NQuxDIkxTEyaDSn4mRT2lPNEg00epkGNEyep6geoMkSbJgI0JT2lPUMj
1GQABo9JoAGhgxJqno0m1CaT9U9qbVB7VBkzUwnqBoaaPU0ZD9JBw00yMRhNMBDAJphGCYmQ0yND
QCSRMk0wmjEU9DaNU8p5T1PU0NGgDQABoNJPhjy11cwv38xxzUhKdlEaTc1oErEnvCxqsBESougL
ih5bCCQxJ1UdYu6r0kBp9G0z/cZB7K3MEMyfEmjJL/X01C9v7Ex9K16OF/ioXx/H+w2Nc3zeKhDW
+L9MbBGwPcoigy6589dWyOQKgMx4UGaKyHN8JBOCOQoEANp9QyCeT800Qe3Ly43NpIu3vAAHNirj
wORjQzqzYzgmAc1+2kMLCBUUDKD9ZguLC9ovGbtSrgekxaYIUTRnbTwoQNo07kSRQgNFpA9gqjG1
a3jVNyQeR+zwajD0vzYC4KqQ4NlooETqu5rXElPRcwlnoeQmK+lgRpniQOgzCC8Qxy3Sq2iAO4hS
7cDG0sWgujaGIEEsGJvlhAF4QUawaiAwqqrNERmzShSisTQWQOGdqg9+4HzjTkif0Trpts9w16kb
Co2Mc20YMDuHEz6WfQ4NAqnwAXoCsLR2q/S0B/G0qOt2utS83COOfUKUwG5kB3fGs4uBos9gZBT8
MDsm2SBxqqmtFIgirNYihVhONw1SyKxvNgcmdwOEIVhjEaRpOYN8kkEUJzsnNLVBqxYoo5Gh4DnF
67nb828JB3fRRgkS6c7e6Hc3UUJ9/L5/3s7cUpSW1+mcU0vv3V1fTD6jrx4UPg25ZDrXs/sTg4gp
Z/4rFNTi4tZqRCt2WF9ysI8YDDUg2wt2fli7HoC5+ccsD8uPz9fySPKWZfZXAPbbmfIrJxBER6kW
rtGA0srtrjLg6y/YUUg8oPwOOSn5DSC+Ycws+JV0L0zlfJagC0kUblcX14qYoCwphYVAjOQYEXRU
OYUdfkYeFYw6hbfYAbhqXXbYHr6KbBw2MFzN71ZjeqUQKZJ9HcW0U7PaXWCWXj57s9b7Uv96jQZN
wUofEYaqNBx99FtkSNCgPL4Gi1PQMAuFKywbZxr0iETeF23mdJOdg2IE2hnQfIUn2YCMGTWILwW0
1BywNZkg6xDLHS4Q00uxNJ19tuoyqB0yHhsCqEnLNibkDgENwEWvi0BebpbTq6ABUbjcDDlFQDeo
HcdJrCoKnBmxBu440hiTdoh6JpzbSC0N0d36NQa1f9zeM7DcqzScrY3Lnlr78YlPmMkZmGGRzpsB
hEmJ0Ag9PeYxcX9eNwiWLAzJlHXVXLPKOLwUTEAwDcuqXsLQMS/yRqCpdQ4K6a6lPnZlfuT2TMEA
1+n2x1uvRMrBcRbcVjHUIqjZLmKEn4sIsl2zB4GOKRy7NFojHTTMyRDIhgPCwVLABZ/WY2nNlCvU
6LwOmLm4wEcODRm3UmcRWh1IDrB7VNO0XuUHkgWbyD3ZMpWxNvxzRETUDog8M84UKtpBlCYRVsFb
0ekq5oFGy84JriJBVKgMorpRV2EFmrncYGYhf8RZUHY+7WF/xdyRThQkBbxQPEA=


--===============0996766446==--