List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:December 21 2010 10:55am
Subject:bzr commit into mysql-trunk-bugfixing branch (andrei.elkin:3459)
View as plain text  
#At file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk-bugfixing/ based on revid:andrei.elkin@stripped

 3459 Andrei Elkin	2010-12-21 [merge]
      merge from mysql-trunk-bugfixing repo to local branch with bug fixes

    modified:
      mysql-test/extra/rpl_tests/rpl_auto_increment.test
      mysql-test/suite/rpl/r/rpl_auto_increment.result
      sql/log_event.cc
      sql/log_event.h
      sql/rpl_record.cc
      sql/rpl_record.h
=== modified file 'mysql-test/extra/rpl_tests/rpl_auto_increment.test'
--- a/mysql-test/extra/rpl_tests/rpl_auto_increment.test	2010-12-19 17:22:30 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_auto_increment.test	2010-12-21 10:39:20 +0000
@@ -229,5 +229,31 @@ source include/diff_tables.inc;
 DROP TABLE t1;
 DROP TABLE t2;
 SET SQL_MODE='';
+sync_slave_with_master;
+
+#
+# BUG#56662
+# The test verifies if the assertion of "next_insert_id == 0"
+# will fail in ha_external_lock() function.
+#
+connection master;
+CREATE TABLE t1 (id SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, data INT) ENGINE=innodb;
+
+BEGIN;
+--echo # Set sql_mode with NO_AUTO_VALUE_ON_ZERO for allowing
+--echo # zero to fill the auto_increment field.
+SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
+INSERT INTO t1(id,data) VALUES(0,2);
+--echo # Resetting sql_mode without NO_AUTO_VALUE_ON_ZERO to
+--echo # affect the execution of the transaction on slave.
+SET SQL_MODE=0;
+COMMIT;
+SELECT * FROM t1;
+sync_slave_with_master;
+SELECT * FROM t1;
+
+connection master;
+DROP TABLE t1;
+sync_slave_with_master;
 
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_auto_increment.result'
--- a/mysql-test/suite/rpl/r/rpl_auto_increment.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_auto_increment.result	2010-12-21 04:47:22 +0000
@@ -303,4 +303,21 @@ include/diff_tables.inc [master:t2, slav
 DROP TABLE t1;
 DROP TABLE t2;
 SET SQL_MODE='';
+CREATE TABLE t1 (id SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, data INT) ENGINE=innodb;
+BEGIN;
+# Set sql_mode with NO_AUTO_VALUE_ON_ZERO for allowing
+# zero to fill the auto_increment field.
+SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
+INSERT INTO t1(id,data) VALUES(0,2);
+# Resetting sql_mode without NO_AUTO_VALUE_ON_ZERO to
+# affect the execution of the transaction on slave.
+SET SQL_MODE=0;
+COMMIT;
+SELECT * FROM t1;
+id	data
+0	2
+SELECT * FROM t1;
+id	data
+0	2
+DROP TABLE t1;
 include/rpl_end.inc

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-12-14 17:37:12 +0000
+++ b/sql/log_event.cc	2010-12-21 10:39:20 +0000
@@ -8089,6 +8089,14 @@ int Rows_log_event::do_apply_event(Relay
     // Do event specific preparations 
     error= do_before_row_operations(rli);
 
+    /*
+      Bug#56662 Assertion failed: next_insert_id == 0, file handler.cc
+      Don't allow generation of auto_increment value when processing
+      rows event by setting 'MODE_NO_AUTO_VALUE_ON_ZERO'.
+    */
+    ulong saved_sql_mode= thd->variables.sql_mode;
+    thd->variables.sql_mode= MODE_NO_AUTO_VALUE_ON_ZERO;
+
     // row processing loop
 
     while (error == 0)
@@ -8155,6 +8163,11 @@ int Rows_log_event::do_apply_event(Relay
         break;
     } // row processing loop
 
+    /*
+      Restore the sql_mode after the rows event is processed.
+    */
+    thd->variables.sql_mode= saved_sql_mode;
+
     {/**
          The following failure injecion works in cooperation with tests 
          setting @@global.debug= 'd,stop_slave_middle_group'.
@@ -9124,16 +9137,11 @@ Rows_log_event::write_row(const Relay_lo
   int UNINIT_VAR(keynum);
   auto_afree_ptr<char> key(NULL);
 
-  /* fill table->record[0] with default values */
-  bool abort_on_warnings= (rli->info_thd->variables.sql_mode &
-                           (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES));
-  if ((error= prepare_record(table, &m_cols,
-                             table->file->ht->db_type != DB_TYPE_NDBCLUSTER,
-                             abort_on_warnings, m_curr_row == m_rows_buf)))
-    DBUG_RETURN(error);
-  
+  prepare_record(table, &m_cols,
+                 table->file->ht->db_type != DB_TYPE_NDBCLUSTER);
+
   /* unpack row into table->record[0] */
-  if ((error= unpack_current_row(rli, &m_cols, abort_on_warnings)))
+  if ((error= unpack_current_row(rli, &m_cols)))
     DBUG_RETURN(error);
 
   // Temporary fix to find out why it fails [/Matz]
@@ -10255,11 +10263,9 @@ Update_rows_log_event::do_exec_row(const
 
   store_record(m_table,record[1]);
 
-  bool abort_on_warnings= (rli->info_thd->variables.sql_mode &
-                           (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES));
   m_curr_row= m_curr_row_end;
   /* this also updates m_curr_row_end */
-  if ((error= unpack_current_row(rli, &m_cols_ai, abort_on_warnings)))
+  if ((error= unpack_current_row(rli, &m_cols_ai)))
     return error;
 
   /*

=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2010-12-05 22:51:49 +0000
+++ b/sql/log_event.h	2010-12-21 10:39:20 +0000
@@ -3694,16 +3694,13 @@ protected:
 
   // Unpack the current row into m_table->record[0]
   int unpack_current_row(const Relay_log_info *const rli,
-                         MY_BITMAP const *cols,
-                         const bool abort_on_warning= TRUE)
+                         MY_BITMAP const *cols)
   { 
     DBUG_ASSERT(m_table);
 
-    bool first_row= (m_curr_row == m_rows_buf);
     ASSERT_OR_RETURN_ERROR(m_curr_row <= m_rows_end, HA_ERR_CORRUPT_EVENT);
     int const result= ::unpack_row(rli, m_table, m_width, m_curr_row, cols,
-                                   &m_curr_row_end, &m_master_reclength,
-                                   abort_on_warning, first_row);
+                                   &m_curr_row_end, &m_master_reclength);
     if (m_curr_row_end > m_rows_end)
       my_error(ER_SLAVE_CORRUPT_EVENT, MYF(0));
     ASSERT_OR_RETURN_ERROR(m_curr_row_end <= m_rows_end, HA_ERR_CORRUPT_EVENT);

=== modified file 'sql/rpl_record.cc'
--- a/sql/rpl_record.cc	2010-11-07 23:44:51 +0000
+++ b/sql/rpl_record.cc	2010-12-21 10:39:20 +0000
@@ -196,8 +196,7 @@ int
 unpack_row(Relay_log_info const *rli,
            TABLE *table, uint const colcnt,
            uchar const *const row_data, MY_BITMAP const *cols,
-           uchar const **const row_end, ulong *const master_reclength,
-           const bool abort_on_warning, const bool first_row)
+           uchar const **const row_end, ulong *const master_reclength)
 {
   DBUG_ENTER("unpack_row");
   DBUG_ASSERT(row_data);
@@ -313,22 +312,9 @@ unpack_row(Relay_log_info const *rli,
         }
         else
         {
-          MYSQL_ERROR::enum_warning_level error_type=
-            MYSQL_ERROR::WARN_LEVEL_NOTE;
-          if (abort_on_warning && (table->file->has_transactions() ||
-                                   first_row))
-          {
-            error = HA_ERR_ROWS_EVENT_APPLY;
-            error_type= MYSQL_ERROR::WARN_LEVEL_ERROR;
-          }
-          else
-          {
-            f->set_default();
-            error_type= MYSQL_ERROR::WARN_LEVEL_WARN;
-          }
-          push_warning_printf(current_thd, error_type,
-                              ER_BAD_NULL_ERROR,
-                              ER(ER_BAD_NULL_ERROR),
+          f->set_default();
+          push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                              ER_BAD_NULL_ERROR, ER(ER_BAD_NULL_ERROR),
                               f->field_name);
         }
       }
@@ -458,19 +444,13 @@ unpack_row(Relay_log_info const *rli,
  
   @param table  Table whose record[0] buffer is prepared. 
   @param check  Specifies if lack of default error needs checking.
-  @param abort_on_warning
-                Controls how to react on lack of a field's default.
-                The parameter mimics the master side one for
-                @c check_that_all_fields_are_given_values.
-                
+
   @returns 0 on success or a handler level error code
  */ 
-int prepare_record(TABLE *const table, const MY_BITMAP *cols, const bool check,
-                   const bool abort_on_warning, const bool first_row)
+int prepare_record(TABLE *const table, const MY_BITMAP *cols, const bool check)
 {
   DBUG_ENTER("prepare_record");
 
-  int error= 0;
   restore_record(table, s->default_values);
 
   if (!check)
@@ -493,28 +473,17 @@ int prepare_record(TABLE *const table, c
       if ((f->flags &  NO_DEFAULT_VALUE_FLAG) &&
           (f->real_type() != MYSQL_TYPE_ENUM))
       {
-        MYSQL_ERROR::enum_warning_level error_type=
-          MYSQL_ERROR::WARN_LEVEL_NOTE;
-        if (abort_on_warning && (table->file->has_transactions() ||
-                                 first_row))
-        {
-          error= HA_ERR_ROWS_EVENT_APPLY;
-          error_type= MYSQL_ERROR::WARN_LEVEL_ERROR;
-        }
-        else
-        {
-          DBUG_PRINT("debug", ("Set default; field: %s", f->field_name));
-          f->set_default();
-          error_type= MYSQL_ERROR::WARN_LEVEL_WARN;
-        }
-        push_warning_printf(current_thd, error_type,
+        f->set_default();
+        push_warning_printf(current_thd,
+                            MYSQL_ERROR::WARN_LEVEL_WARN,
                             ER_NO_DEFAULT_FOR_FIELD,
                             ER(ER_NO_DEFAULT_FOR_FIELD),
                             f->field_name);
       }
     }
   }
-  DBUG_RETURN(error);
+
+  DBUG_RETURN(0);
 }
 
 #endif // HAVE_REPLICATION

=== modified file 'sql/rpl_record.h'
--- a/sql/rpl_record.h	2010-09-04 00:46:58 +0000
+++ b/sql/rpl_record.h	2010-12-21 10:39:20 +0000
@@ -32,14 +32,10 @@ size_t pack_row(TABLE* table, MY_BITMAP 
 int unpack_row(Relay_log_info const *rli,
                TABLE *table, uint const colcnt,
                uchar const *const row_data, MY_BITMAP const *cols,
-               uchar const **const row_end, ulong *const master_reclength,
-               const bool abort_on_warning= TRUE, const bool first_row= TRUE);
+               uchar const **const row_end, ulong *const master_reclength);
 
 // Fill table's record[0] with default values.
-int prepare_record(TABLE *const table, const MY_BITMAP *cols,
-                   const bool check,
-                   const bool abort_on_warning= TRUE,
-                   const bool first_row= TRUE);
+int prepare_record(TABLE *const table, const MY_BITMAP *cols, const bool check);
 #endif
 
 #endif


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20101221105504-tzcr2etjfazkmip3.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (andrei.elkin:3459) Andrei Elkin21 Dec