bk commit into 5.1 tree (mkindahl:1.2250)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl 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, 2006-07-12 10:07:07+02:00, mkindahl@stripped +1 -0
  Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1
  into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
  MERGE: 1.2244.1.7

  sql/ha_federated.cc@stripped, 2006-07-12 10:07:03+02:00, mkindahl@stripped +0 -0
    Auto merged
    MERGE: 1.63.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mkindahl
# Host:	dl145k.mysql.com
# Root:	/data0/mkindahl/bk/mysql-5.1-new-rpl/RESYNC

--- 1.65/sql/ha_federated.cc	2006-07-12 10:07:14 +02:00
+++ 1.66/sql/ha_federated.cc	2006-07-12 10:07:14 +02:00
@@ -631,7 +631,8 @@
   DBUG_PRINT("info", ("String: '%.*s'", table->s->connect_string.length, 
                       table->s->connect_string.str));
   share->scheme= my_strndup(table->s->connect_string.str,
-                            table->s->connect_string.length, MYF(0));
+                            table->s->connect_string.length,
+                            MYF(0));
 
   share->connect_string_length= table->s->connect_string.length;
   DBUG_PRINT("info",("parse_url alloced share->scheme %lx", share->scheme));
@@ -1702,14 +1703,15 @@
   This method ensures that last_insert_id() works properly. What it simply does
   is calls last_insert_id() on the foreign database immediately after insert
   (if the table has an auto_increment field) and sets the insert id via
-  thd->insert_id(ID) (as well as storing thd->prev_insert_id)
+  thd->insert_id(ID)).
 */
 void ha_federated::update_auto_increment(void)
 {
   THD *thd= current_thd;
   DBUG_ENTER("ha_federated::update_auto_increment");
 
-  thd->insert_id(mysql->last_used_con->insert_id);
+  thd->first_successful_insert_id_in_cur_stmt= 
+    mysql->last_used_con->insert_id;
   DBUG_PRINT("info",("last_insert_id %d", stats.auto_increment_value));
 
   DBUG_VOID_RETURN;