bk commit into 5.1 tree (sven:1.2559)

[Sven Sandberg]

Below is the list of changes that have just been committed into a local
5.1 repository of sven.  When sven 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, 2008-02-20 15:22:14+01:00, sven@riska.(none) +2 -0
  Removed the unused function int THD::binlog_flush_transaction_cache()

  sql/log.cc@stripped, 2008-02-20 15:22:13+01:00, sven@riska.(none) +0 -29
    Removed the unused function int THD::binlog_flush_transaction_cache()

  sql/sql_class.h@stripped, 2008-02-20 15:22:13+01:00, sven@riska.(none) +0 -1
    Removed the unused function int THD::binlog_flush_transaction_cache()

diff -Nrup a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc	2008-02-09 03:37:53 +01:00
+++ b/sql/log.cc	2008-02-20 15:22:13 +01:00
@@ -3403,35 +3403,6 @@ void THD::binlog_set_stmt_begin() {
   trx_data->before_stmt_pos= pos;
 }
 
-int THD::binlog_flush_transaction_cache()
-{
-  DBUG_ENTER("binlog_flush_transaction_cache");
-  binlog_trx_data *trx_data= (binlog_trx_data*)
-    thd_get_ha_data(this, binlog_hton);
-  DBUG_PRINT("enter", ("trx_data=0x%lu", (ulong) trx_data));
-  if (trx_data)
-    DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%lu",
-                         (ulong) trx_data->before_stmt_pos));
-
-  /*
-    Write the transaction cache to the binary log.  We don't flush and
-    sync the log file since we don't know if more will be written to
-    it. If the caller want the log file sync:ed, the caller has to do
-    it.
-
-    The transaction data is only reset upon a successful write of the
-    cache to the binary log.
-  */
-
-  if (trx_data && likely(mysql_bin_log.is_open())) {
-    if (int error= mysql_bin_log.write_cache(&trx_data->trans_log, true, true))
-      DBUG_RETURN(error);
-    trx_data->reset();
-  }
-
-  DBUG_RETURN(0);
-}
-
 
 /*
   Write a table map to the binary log.
diff -Nrup a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h	2008-01-31 16:31:51 +01:00
+++ b/sql/sql_class.h	2008-02-20 15:22:13 +01:00
@@ -1243,7 +1243,6 @@ public:
     Public interface to write RBR events to the binlog
   */
   void binlog_start_trans_and_stmt();
-  int binlog_flush_transaction_cache();
   void binlog_set_stmt_begin();
   int binlog_write_table_map(TABLE *table, bool is_transactional);
   int binlog_write_row(TABLE* table, bool is_transactional,