List:Commits« Previous MessageNext Message »
From:Luis Soares Date:March 5 2009 9:14pm
Subject:bzr commit into mysql-6.0-bugteam branch (luis.soares:3110) Bug#39753
View as plain text  
#At file:///home/lsoares/Workspace/mysql-server/bugfix/39753/6.0-bt/ based on revid:sergey.glukhov@stripped

 3110 Luis Soares	2009-03-05 [merge]
      BUG#39753: Replication failure on MIXED + bit + myisam + no PK
      
      up-merge: 5.1-bt --> 6.0-bt

    added:
      mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result
      mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test
    modified:
      sql/rpl_record.cc
=== added file 'mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result	2009-03-05 19:54:53 +0000
@@ -0,0 +1,32 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
+CREATE TABLE t1 (`bit_key` bit, `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t2 (`bit_key` bit(4), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t3 (`bit_key` bit(7), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t4 (`bit_key` bit(8), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t5 (`bit_key` bit(9), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t6 (`bit_key` bit(14), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t7 (`bit_key` bit(15), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t8 (`bit_key` bit(16), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+INSERT INTO `t1` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t1` WHERE `bit` < 2 LIMIT 4;
+INSERT INTO `t2` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t2` WHERE `bit` < 2 LIMIT 4;
+INSERT INTO `t3` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t3` WHERE `bit` < 2 LIMIT 4;
+INSERT INTO `t4` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t4` WHERE `bit` < 2 LIMIT 4;
+INSERT INTO `t5` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t5` WHERE `bit` < 2 LIMIT 4;
+INSERT INTO `t6` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t6` WHERE `bit` < 2 LIMIT 4;
+INSERT INTO `t7` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t7` WHERE `bit` < 2 LIMIT 4;
+INSERT INTO `t8` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t8` WHERE `bit` < 2 LIMIT 4;
+DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8;

=== added file 'mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test	2009-03-05 19:54:53 +0000
@@ -0,0 +1,78 @@
+#
+# BUG
+# ---
+#  BUG#39753: Replication failure on MIXED + bit + myisam + no PK
+#
+# Description
+# -----------
+#  Simple statements against a bit column cause failure in mixed-mode
+#  replication.
+#
+#  Implementation is as follows:
+#     i) A table with two bit fields is created. One of them is a key.
+#    ii) A record is inserted without specifying the key value.
+#   iii) The record is deleted using a where clause that matches it.
+#    iv) repeat i-iii) for bit key that has different size, generating
+#        different extra bits values 
+#     v) The slave is synchronized with master 
+#    vi) The table is dropped on master and the slave is re-synchronized
+#        with master.
+#
+#  Step v) made the bug evident before the patch, as the slave would 
+#  fail to find the correspondent row in its database (although it did
+#  the insert in step ii) ).
+#
+# Obs
+# --- 
+#  This test is based on the "how to repeat" section from the bug report.
+#
+#
+
+--source include/master-slave.inc
+
+--disable_warnings
+# setup
+
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
+CREATE TABLE t1 (`bit_key` bit, `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t2 (`bit_key` bit(4), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t3 (`bit_key` bit(7), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t4 (`bit_key` bit(8), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t5 (`bit_key` bit(9), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t6 (`bit_key` bit(14), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t7 (`bit_key` bit(15), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+CREATE TABLE t8 (`bit_key` bit(16), `bit` bit, key (`bit_key` )) ENGINE=MyISAM;
+
+# insert and delete
+INSERT INTO `t1` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t1` WHERE `bit` < 2 LIMIT 4;
+
+INSERT INTO `t2` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t2` WHERE `bit` < 2 LIMIT 4;
+
+INSERT INTO `t3` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t3` WHERE `bit` < 2 LIMIT 4;
+
+INSERT INTO `t4` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t4` WHERE `bit` < 2 LIMIT 4;
+
+INSERT INTO `t5` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t5` WHERE `bit` < 2 LIMIT 4;
+
+INSERT INTO `t6` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t6` WHERE `bit` < 2 LIMIT 4;
+
+INSERT INTO `t7` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t7` WHERE `bit` < 2 LIMIT 4;
+
+INSERT INTO `t8` ( `bit` ) VALUES ( 0 );
+DELETE FROM `t8` WHERE `bit` < 2 LIMIT 4;
+
+
+--enable_warnings
+sync_slave_with_master;
+
+# clean up 
+connection master;
+DROP TABLE t1, t2, t3, t4, t5, t6, t7, t8;
+sync_slave_with_master;

=== modified file 'sql/rpl_record.cc'
--- a/sql/rpl_record.cc	2008-09-09 08:19:21 +0000
+++ b/sql/rpl_record.cc	2009-03-05 21:13:37 +0000
@@ -362,30 +362,22 @@ unpack_row(Relay_log_info const *rli,
 /**
   Fills @c table->record[0] with default values.
 
-  First @c empty_record() is called and then, additionally, fields are
-  initialized explicitly with a call to @c set_default().
+  First @c restore_record() is called to restore default values.
 
-  For optimization reasons, the explicit initialization can be skipped
-  for fields that are not marked in the @c cols vector. These fields
-  will be set later, and filling them with default values is
-  unnecessary.
-
-  If @c check is true, fields are explicitly initialized only if they
-  have default value or can be NULL. Otherwise error is reported. If
-  @c check is false, no error is reported and the field is not set to
-  any value.
+  If @c check is true, fields are explicitly check if they have default
+  value or can be NULL. Otherwise error is reported. If @c check is false, 
+  no error is reported and the field is not checked for default value.
 
   @todo When flag is added to allow engine to handle default values
   itself, the record should not be emptied and default values not set.
 
   @param table[in,out] Table whose record[0] buffer is prepared. 
-  @param cols[in]      Vector of bits denoting columns that will be set
-                       elsewhere
-  @param check[in]     Indicates if errors should be checked when setting default
+  @param cols[in]      Vector of bits denoting columns that will not be checked.
+  @param check[in]     Indicates if errors should be raised when checking default 
                        values.
 
   @retval 0                       Success
-  @retval ER_NO_DEFAULT_FOR_FIELD Default value could not be set for a field
+  @retval ER_NO_DEFAULT_FOR_FIELD Default value could not be checked for a field
  */ 
 int prepare_record(TABLE *const table, 
                    const MY_BITMAP *cols, uint width, const bool check)
@@ -393,13 +385,14 @@ int prepare_record(TABLE *const table, 
   DBUG_ENTER("prepare_record");
 
   int error= 0;
-  empty_record(table);
+  restore_record(table, s->default_values);
+
+  if (!check)
+    DBUG_RETURN(error);
 
   /*
-    Explicit initialization of fields. For fields that are not in the
-    cols for the row, we set them to default. If the fields are in
-    addition to what exists on the master, we give an error if the
-    have no sensible default.
+    For fields that are not in the cols for the row, we check them if they
+    have default or can be null.
   */
 
   DBUG_PRINT_BITSET("debug", "cols: %s", cols);
@@ -411,16 +404,11 @@ int prepare_record(TABLE *const table, 
       uint32 const mask= NOT_NULL_FLAG | NO_DEFAULT_VALUE_FLAG;
       Field *const f= *field_ptr;
 
-      if (check && ((f->flags & mask) == mask))
+      if (((f->flags & mask) == mask))
       {
         my_error(ER_NO_DEFAULT_FOR_FIELD, MYF(0), f->field_name);
         error = HA_ERR_ROWS_EVENT_APPLY;
       }
-      else
-      {
-        DBUG_PRINT("debug", ("Set default; field: %s", f->field_name));
-        f->set_default();
-      }
     }
   }
 


Attachment: [text/bzr-bundle] bzr/luis.soares@sun.com-20090305211337-y29po3rnp3qxiqoo.bundle
Thread
bzr commit into mysql-6.0-bugteam branch (luis.soares:3110) Bug#39753Luis Soares5 Mar