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

[Mattias Jonsson]

 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

 2872 Davi Arnaut	2008-10-13 [merge]
      Cherry-pick Bug#39916 from mysql-6.0-bugteam
modified:
  mysql-test/r/status.result
  mysql-test/t/status.test
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/scheduler.cc

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