bk commit into 5.1 tree (mats:1.2343)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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-10-05 22:16:19+02:00, mats@romeo.(none) +2 -0
  Post-merge fixes.

  sql/log.cc@stripped, 2006-10-05 22:16:13+02:00, mats@romeo.(none) +10 -10
    Post-merge fixes.

  sql/sql_insert.cc@stripped, 2006-10-05 22:16:14+02:00, mats@romeo.(none) +1 -1
    Post-merge fixes.

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b20265-mysql-5.1-new-rpl

--- 1.235/sql/log.cc	2006-10-05 22:16:27 +02:00
+++ 1.236/sql/log.cc	2006-10-05 22:16:27 +02:00
@@ -1253,10 +1253,10 @@
 {
   DBUG_ENTER("binlog_trans_log_savepos");
   DBUG_ASSERT(pos != NULL);
-  if (thd->ha_data[binlog_hton.slot] == NULL)
+  if (thd->ha_data[binlog_hton->slot] == NULL)
     thd->binlog_setup_trx_data();
   binlog_trx_data *const trx_data=
-    (binlog_trx_data*) thd->ha_data[binlog_hton.slot];
+    (binlog_trx_data*) thd->ha_data[binlog_hton->slot];
   DBUG_ASSERT(mysql_bin_log.is_open());
   *pos= trx_data->position();
   DBUG_PRINT("return", ("*pos=%u", *pos));
@@ -1285,12 +1285,12 @@
   DBUG_ENTER("binlog_trans_log_truncate");
   DBUG_PRINT("enter", ("pos=%u", pos));
 
-  DBUG_ASSERT(thd->ha_data[binlog_hton.slot] != NULL);
+  DBUG_ASSERT(thd->ha_data[binlog_hton->slot] != NULL);
   /* Only true if binlog_trans_log_savepos() wasn't called before */
   DBUG_ASSERT(pos != ~(my_off_t) 0);
 
   binlog_trx_data *const trx_data=
-    (binlog_trx_data*) thd->ha_data[binlog_hton.slot];
+    (binlog_trx_data*) thd->ha_data[binlog_hton->slot];
   trx_data->truncate(pos);
   DBUG_VOID_RETURN;
 }
@@ -1323,7 +1323,7 @@
   binlog_trx_data *const trx_data=
     (binlog_trx_data*) thd->ha_data[binlog_hton->slot];
   DBUG_ASSERT(mysql_bin_log.is_open() && trx_data->empty());
-  thd->ha_data[binlog_hton.slot]= 0;
+  thd->ha_data[binlog_hton->slot]= 0;
   trx_data->~binlog_trx_data();
   my_free((gptr)trx_data, MYF(0));
   return 0;
@@ -3294,7 +3294,7 @@
     DBUG_RETURN(1);                      // Didn't manage to set it up
   }
 
-  trx_data= new (ha_data[binlog_hton.slot]) binlog_trx_data;
+  trx_data= new (ha_data[binlog_hton->slot]) binlog_trx_data;
 
   DBUG_RETURN(0);
 }
@@ -3332,7 +3332,7 @@
 THD::binlog_start_trans_and_stmt()
 {
   DBUG_ENTER("binlog_start_trans_and_stmt");
-  binlog_trx_data *trx_data= (binlog_trx_data*) ha_data[binlog_hton.slot];
+  binlog_trx_data *trx_data= (binlog_trx_data*) ha_data[binlog_hton->slot];
   DBUG_PRINT("enter", ("trx_data=0x%lu", trx_data));
   if (trx_data)
     DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%u",
@@ -3348,13 +3348,13 @@
     */
     my_off_t pos= 0;
     binlog_trans_log_savepos(this, &pos);
-    trx_data= (binlog_trx_data*) ha_data[binlog_hton.slot];
+    trx_data= (binlog_trx_data*) ha_data[binlog_hton->slot];
 
     trx_data->before_stmt_pos= pos;
 
     if (options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
-      trans_register_ha(this, TRUE, &binlog_hton);
-    trans_register_ha(this, FALSE, &binlog_hton);
+      trans_register_ha(this, TRUE, binlog_hton);
+    trans_register_ha(this, FALSE, binlog_hton);
   }
   DBUG_VOID_RETURN;
 }

--- 1.227/sql/sql_insert.cc	2006-10-05 22:16:27 +02:00
+++ 1.228/sql/sql_insert.cc	2006-10-05 22:16:27 +02:00
@@ -2637,10 +2637,10 @@
         query_cache_invalidate3(thd, table, 1);
       }
     }
+    table->file->ha_release_auto_increment();
   }
 
   ha_rollback_stmt(thd);
-  table->file->ha_release_auto_increment();
   DBUG_VOID_RETURN;
 }