bzr commit into mysql-6.0 branch (mattias.jonsson:2873) Bug#40003

[Mattias Jonsson]

#At file:///Users/mattiasj/clones/bzrroot/topush-60-5129rc/

 2873 Mattias Jonsson	2008-10-13
      Bug#40003: valgrind warning in
      parts.partition_auto_increment_archive
      
      post fix for bug#38719, fix for valgrind warning
modified:
  sql/ha_partition.cc

per-file messages:
  sql/ha_partition.cc
    Bug#40003: valgrind warning in
    parts.partition_auto_increment_archive
    
    Archive has not implemented HA_STATUS_ERRKEY
    So to avoid using an uninitialized value,
    we set it (errkey is set in
    handler::get_dup_key)
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2008-10-06 13:16:20 +0000
+++ b/sql/ha_partition.cc	2008-10-13 19:26:56 +0000
@@ -4851,10 +4851,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)
   {