bk commit into 5.1 tree (tomas:1.1896)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.1896 05/08/17 18:28:10 tomas@stripped +3 -0
  merge

  sql/rpl_injector.cc
    1.2 05/08/17 18:28:05 tomas@stripped +6 -8
    merge

  sql/handler.cc
    1.187 05/08/17 18:28:05 tomas@stripped +8 -8
    merge

  sql/ha_ndbcluster.cc
    1.207 05/08/17 18:28:05 tomas@stripped +2 -2
    merge

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-a

--- 1.186/sql/handler.cc	2005-08-17 13:48:50 +02:00
+++ 1.187/sql/handler.cc	2005-08-17 18:28:05 +02:00
@@ -2680,11 +2680,11 @@
     strcmp(table->s->db, "mysql") != 0;
 }
 
-template<class RowsEventT> bool binlog_log_row(TABLE* table,
+template<class RowsEventT> bool binlog_log_row(handler *h, TABLE* table,
                                                const byte *before_record,
                                                byte *after_record)
 {
-  if (this->is_injective())
+  if (h->is_injective())
     return 0;
   if (check_table_binlog_row_based(table)) 
   {
@@ -2715,9 +2715,9 @@
   have -fno-implicit-template as compiling option.
 */
 
-template bool binlog_log_row<Write_rows_log_event>(TABLE *, const byte *, byte *);
-template bool binlog_log_row<Delete_rows_log_event>(TABLE *, const byte *, byte *);
-template bool binlog_log_row<Update_rows_log_event>(TABLE *, const byte *, byte *);
+template bool binlog_log_row<Write_rows_log_event>(handler *, TABLE *, const byte *, byte *);
+template bool binlog_log_row<Delete_rows_log_event>(handler *, TABLE *, const byte *, byte *);
+template bool binlog_log_row<Update_rows_log_event>(handler *, TABLE *, const byte *, byte *);
 
 #endif /* HAVE_ROW_BASED_REPLICATION */
 
@@ -2729,7 +2729,7 @@
   {
 #ifdef HAVE_ROW_BASED_REPLICATION
     /* TODO catch return code here and in 2 next */
-    binlog_log_row<Write_rows_log_event>(table, 0, buf);
+    binlog_log_row<Write_rows_log_event>(this, table, 0, buf);
 #endif
   }
   return error;
@@ -2742,7 +2742,7 @@
   if (likely(!(error= update_row(old_data, new_data))))
   {
 #ifdef HAVE_ROW_BASED_REPLICATION
-    binlog_log_row<Update_rows_log_event>(table, old_data, new_data);
+    binlog_log_row<Update_rows_log_event>(this, table, old_data, new_data);
 #endif
   }
   return error;
@@ -2755,7 +2755,7 @@
   if (likely(!(error= delete_row(buf))))
   {
 #ifdef HAVE_ROW_BASED_REPLICATION
-    binlog_log_row<Delete_rows_log_event>(table, buf, 0);
+    binlog_log_row<Delete_rows_log_event>(this, table, buf, 0);
 #endif
   }
   return error;

--- 1.206/sql/ha_ndbcluster.cc	2005-08-17 13:38:29 +02:00
+++ 1.207/sql/ha_ndbcluster.cc	2005-08-17 18:28:05 +02:00
@@ -5343,7 +5343,7 @@
 #ifdef HAVE_NDB_BINLOG
   if (opt_bin_log)
   {
-    if (opt_binlog_row_based_logging)
+    if (binlog_row_based)
     {
       if (ndbcluster_binlog_start())
       {
@@ -8586,7 +8586,7 @@
   tables->required_type= FRMTYPE_TABLE;
   uint counter;
   thd->clear_error();
-  if (open_tables(thd,&tables,&counter))
+  if (open_tables(thd,&tables,&counter,MYSQL_LOCK_IGNORE_FLUSH))
   {
     sql_print_error("Opening binlog_index: %d, '%s'",
 		    thd->net.last_errno,

--- 1.1/sql/rpl_injector.cc	2005-07-21 20:35:21 +02:00
+++ 1.2/sql/rpl_injector.cc	2005-08-17 18:28:05 +02:00
@@ -69,9 +69,8 @@
 {
    DBUG_ENTER("injector::transaction::write_row(...)");
    m_thd->set_server_id(sid);
-   m_thd->write_row(tbl.get_table(), tbl.is_transactional(), 
-                    cols, colcnt,
-                    record);
+   m_thd->binlog_write_row(tbl.get_table(), tbl.is_transactional(), 
+                           cols, colcnt, record);
    DBUG_RETURN(0);
 }
 
@@ -83,9 +82,8 @@
 {
    DBUG_ENTER("injector::transaction::delete_row(...)");
    m_thd->set_server_id(sid);
-   m_thd->delete_row(tbl.get_table(), tbl.is_transactional(), 
-                     cols, colcnt, 
-                     record);
+   m_thd->binlog_delete_row(tbl.get_table(), tbl.is_transactional(), 
+                            cols, colcnt, record);
    DBUG_RETURN(0);
 }
 
@@ -97,8 +95,8 @@
 {
    DBUG_ENTER("injector::transaction::update_row(...)");
    m_thd->set_server_id(sid);
-   m_thd->update_row(tbl.get_table(), tbl.is_transactional(),
-		     cols, colcnt, before, after);
+   m_thd->binlog_update_row(tbl.get_table(), tbl.is_transactional(),
+		            cols, colcnt, before, after);
    DBUG_RETURN(0);
 }