List:Commits« Previous MessageNext Message »
From:tomas Date:January 10 2006 10:50pm
Subject:bk commit into 5.1 tree (tomas:1.2029)
View as plain text  
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.2029 06/01/10 23:50:03 tomas@stripped +3 -0
  review fixes

  sql/mysqld.cc
    1.517 06/01/10 23:49:49 tomas@stripped +3 -2
    review fixes

  sql/handler.cc
    1.207 06/01/10 23:49:48 tomas@stripped +8 -8
    review fixes

  include/my_base.h
    1.80 06/01/10 23:49:47 tomas@stripped +6 -1
    review 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6

--- 1.79/include/my_base.h	2006-01-05 12:55:41 +01:00
+++ 1.80/include/my_base.h	2006-01-10 23:49:47 +01:00
@@ -155,7 +155,12 @@
   */
   HA_EXTRA_KEYREAD_PRESERVE_FIELDS,
   HA_EXTRA_MMAP,
-  HA_EXTRA_IGNORE_NO_KEY,		/* Tuple not found don't rollback everything*/
+  /* 
+    Ignore if the a tuple is not found, continue processing the
+    transaction and ignore that 'row'.  Needed for idempotency
+    handling on the slave
+  */
+  HA_EXTRA_IGNORE_NO_KEY,
   HA_EXTRA_NO_IGNORE_NO_KEY
 };
 

--- 1.206/sql/handler.cc	2006-01-10 23:33:07 +01:00
+++ 1.207/sql/handler.cc	2006-01-10 23:49:48 +01:00
@@ -2938,11 +2938,11 @@
   }
 }
 
-template<class RowsEventT> int binlog_log_row(handler *h, TABLE* table,
+template<class RowsEventT> int binlog_log_row(TABLE* table,
                                               const byte *before_record,
                                               const byte *after_record)
 {
-  if (h->is_injective())
+  if (table->file->is_injective())
     return 0;
   bool error= 0;
   THD *const thd= current_thd;
@@ -2978,9 +2978,9 @@
   have -fno-implicit-template as compiling option.
 */
 
-template int binlog_log_row<Write_rows_log_event>(handler *, TABLE *, const byte *, const byte *);
-template int binlog_log_row<Delete_rows_log_event>(handler *, TABLE *, const byte *, const byte *);
-template int binlog_log_row<Update_rows_log_event>(handler *, TABLE *, const byte *, const byte *);
+template int binlog_log_row<Write_rows_log_event>(TABLE *, const byte *, const byte *);
+template int binlog_log_row<Delete_rows_log_event>(TABLE *, const byte *, const byte *);
+template int binlog_log_row<Update_rows_log_event>(TABLE *, const byte *, const byte *);
 
 #endif /* HAVE_ROW_BASED_REPLICATION */
 
@@ -2990,7 +2990,7 @@
   if (likely(!(error= write_row(buf))))
   {
 #ifdef HAVE_ROW_BASED_REPLICATION
-    error= binlog_log_row<Write_rows_log_event>(this, table, 0, buf);
+    error= binlog_log_row<Write_rows_log_event>(table, 0, buf);
 #endif
   }
   return error;
@@ -3002,7 +3002,7 @@
   if (likely(!(error= update_row(old_data, new_data))))
   {
 #ifdef HAVE_ROW_BASED_REPLICATION
-    error= binlog_log_row<Update_rows_log_event>(this, table, old_data, new_data);
+    error= binlog_log_row<Update_rows_log_event>(table, old_data, new_data);
 #endif
   }
   return error;
@@ -3014,7 +3014,7 @@
   if (likely(!(error= delete_row(buf))))
   {
 #ifdef HAVE_ROW_BASED_REPLICATION
-    error= binlog_log_row<Delete_rows_log_event>(this, table, buf, 0);
+    error= binlog_log_row<Delete_rows_log_event>(table, buf, 0);
 #endif
   }
   return error;

--- 1.516/sql/mysqld.cc	2006-01-09 18:04:02 +01:00
+++ 1.517/sql/mysqld.cc	2006-01-10 23:49:49 +01:00
@@ -1137,8 +1137,9 @@
 
   mysql_log.cleanup();
   mysql_slow_log.cleanup();
-  /* make sure that handlers finish up
-     what they have that is dependent on the binlog
+  /*
+    make sure that handlers finish up
+    what they have that is dependent on the binlog
   */
   ha_binlog_end(current_thd);
   mysql_bin_log.cleanup();
Thread
bk commit into 5.1 tree (tomas:1.2029)tomas10 Jan