bk commit into 5.1 tree (guilhem:1.2248)

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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-08-01 12:23:02+02:00, guilhem@stripped +1 -0
  I had forgotten to delete an already disabled line of C++ code.

  sql/sql_insert.cc@stripped, 2006-08-01 12:22:59+02:00, guilhem@stripped +0 -2
    I had forgotten to delete this line (it was already disabled using //;
    this line was not needed because we do the empty() every time
    we write to the binlog (in MYSQL_LOG::write());
    t/binlog_stm_binlog.test already tests that the empty() indeed happens
    for INSERT DELAYED.

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-wrong-comment

--- 1.214/sql/sql_insert.cc	2006-08-01 12:23:08 +02:00
+++ 1.215/sql/sql_insert.cc	2006-08-01 12:23:08 +02:00
@@ -2086,8 +2086,6 @@
 
     thd.start_time=row->start_time;
     thd.query_start_used=row->query_start_used;
-    /* for the binlog, forget auto_increment ids generated by previous rows */
-//    thd.auto_inc_intervals_in_cur_stmt_for_binlog.empty();
     thd.first_successful_insert_id_in_prev_stmt= 
       row->first_successful_insert_id_in_prev_stmt;
     thd.stmt_depends_on_first_successful_insert_id_in_prev_stmt=