bk commit into 5.1 tree (guilhem:1.1970)

[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
  1.1970 05/11/21 16:40:17 guilhem@stripped +3 -0
  WL#1012 "row-based replication" last fixes after merge into 5.1;
  failing tests: bdb-deadlock binlog_stm_binlog binlog_stm_mix_innodb_myisam
mysql_client_test mysqlcheck sp
  (the 1st and the last 3 are not RBR issues, they exist in 5.0 and/or 5.1).
  Have checked this merge with mysql-5.1-wl1012-new, comparison is ok.

  sql/log_event.h
    1.139 05/11/21 16:40:12 guilhem@stripped +1 -1
    bitmap_init requires uint32* in 5.1

  sql/log_event.cc
    1.192 05/11/21 16:40:12 guilhem@stripped +9 -9
    fix after merge

  sql/handler.cc
    1.193 05/11/21 16:40:12 guilhem@stripped +1 -1
    bitmap_init takes uint32* in 5.1

# 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

--- 1.192/sql/handler.cc	2005-11-19 16:33:22 +01:00
+++ 1.193/sql/handler.cc	2005-11-21 16:40:12 +01:00
@@ -2675,7 +2675,7 @@
   {
     MY_BITMAP cols;
     /* Potential buffer on the stack for the bitmap */
-    uchar bitbuf[BITMAP_STACKBUF_SIZE];
+    uint32 bitbuf[BITMAP_STACKBUF_SIZE/sizeof(uint32)];
     uint n_fields= table->s->fields;
     my_bool use_bitbuf= n_fields <= sizeof(bitbuf)*8;
     if (likely(!(error= bitmap_init(&cols,

--- 1.191/sql/log_event.cc	2005-11-21 11:07:03 +01:00
+++ 1.192/sql/log_event.cc	2005-11-21 16:40:12 +01:00
@@ -5127,12 +5127,14 @@
 {
   DBUG_ASSERT(record && row);
 
+  MY_BITMAP *write_set= table->file->write_set;
   my_size_t const n_null_bytes= table->s->null_bytes;
   my_ptrdiff_t const offset= record - (byte*) table->record[0];
 
   memcpy(record, row, n_null_bytes);
   char const *ptr= row + n_null_bytes;
 
+  bitmap_set_all(write_set);
   Field **const begin_ptr = table->field;
   for (Field **field_ptr= begin_ptr ; *field_ptr ; ++field_ptr)
   {
@@ -5142,12 +5144,9 @@
     {
       /* Field...::unpack() cannot return 0 */
       ptr= f->unpack(f->ptr + offset, ptr);
-      f->query_id= thd->query_id;
     }
     else
-    {
-        f->query_id= 0UL;
-    }
+      bitmap_clear_bit(write_set, (field_ptr - begin_ptr) + 1);
   }
   return ptr;
 }
@@ -5676,7 +5675,8 @@
   TABLE_LIST table_list;
   uint32 dummy_len;
   bzero(&table_list, sizeof(table_list));
-  table_list.db= const_cast<char *>(rewrite_db(m_dbnam, &dummy_len));
+  table_list.db= const_cast<char *>
+    (rpl_filter->get_rewrite_db(m_dbnam, &dummy_len));
   table_list.alias= table_list.table_name= const_cast<char*>(m_tblnam);
   table_list.lock_type= TL_WRITE;
   table_list.next_global= table_list.next_local= 0;
@@ -5684,8 +5684,8 @@
 
   int error= 0;
 
-  if (db_ok(table_list.db, replicate_do_db, replicate_ignore_db) &&
-      (!table_rules_on || tables_ok(thd, &table_list)))
+  if (rpl_filter->db_ok(table_list.db) &&
+      (!rpl_filter->is_on() || rpl_filter->tables_ok("", &table_list)))
   {
     /*
       Check if the slave is set to use SBR.  If so, the slave should
@@ -6396,7 +6396,7 @@
   {
     /* We have a key: search the table using the index */
     if (!table->file->inited)
-      error= table->file->ha_index_init(0);
+      error= table->file->ha_index_init(0, FALSE);
   }
   else
   {
@@ -6563,7 +6563,7 @@
   {
     /* We have a key: search the table using the index */
     if (!table->file->inited)
-      error= table->file->ha_index_init(0);
+      error= table->file->ha_index_init(0, FALSE);
   }
   else
   {

--- 1.138/sql/log_event.h	2005-11-21 11:07:03 +01:00
+++ 1.139/sql/log_event.h	2005-11-21 16:40:12 +01:00
@@ -1882,7 +1882,7 @@
   ulong       m_width;          /* The width of the columns bitmap */
 
   /* Bit buffer in the same memory as the class */
-  uchar    m_bitbuf[128/(sizeof(uchar)*8)];
+  uint32    m_bitbuf[128/(sizeof(uint32)*8)];
 
   byte    *m_rows_buf;		/* The rows in packed format */
   byte    *m_rows_cur;		/* One-after the end of the data */