bk commit into 5.1 tree (antony:1.2556)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-24 07:23:59-07:00, antony@stripped +1 -0
  post 5.0 to 5.1 merge fixes

  storage/federated/ha_federated.cc@stripped, 2007-07-24 07:23:51-07:00, antony@stripped +2 -2
    post 5.0 to 5.1 merge fixes

diff -Nrup a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
--- a/storage/federated/ha_federated.cc	2007-07-24 00:02:57 -07:00
+++ b/storage/federated/ha_federated.cc	2007-07-24 07:23:51 -07:00
@@ -2029,7 +2029,7 @@ int ha_federated::write_row(uchar *buf)
     update_auto_increment();
 
     /* mysql_insert() uses this for protocol return value */
-    table->next_number_field->store(auto_increment_value, 1);
+    table->next_number_field->store(stats.auto_increment_value, 1);
   }
 
   DBUG_RETURN(0);
@@ -2940,7 +2940,7 @@ int ha_federated::info(uint flag)
   }
 
   if (flag & HA_STATUS_AUTO)
-    auto_increment_value= mysql->last_used_con->insert_id;
+    stats.auto_increment_value= mysql->last_used_con->insert_id;
 
   mysql_free_result(result);