bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:2810)

[Mattias Jonsson]

#At file:///Users/mattiasj/clones/bzrroot/topush-51-bugteam/ based on revid:patrick.crews@stripped

 2810 Mattias Jonsson	2009-02-20 [merge]
      merge

    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)
   {


Attachment: [text/bzr-bundle] bzr/[e-mail]