From: Rohit Kalhans
Date: August 22 2012 8:32am
Subject: bzr push into mysql-trunk branch (rohit.kalhans:4269 to 4270) Bug#14390948
List-Archive: http://lists.mysql.com/commits/144592
X-Bug: 14390948
Message-Id: <201208220832.q7M8WFkX024376@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4270 Rohit Kalhans	2012-08-22 [merge]
      BUG#14390948: upmerge the fix from 5.6=>mysql-trunk

    modified:
      sql/log_event.cc
      sql/rpl_rli_pdb.h
 4269 viswanatham gudipati	2012-08-22
      Fixing the sporadic failure problem by removing the statment --remove_file.
      no change is required in the result file

    modified:
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_after_commit_0.test
      mysql-test/suite/innodb/t/innodb_crash_recov_log_compressed_after_commit_1.test
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2012-07-16 19:38:00 +0000
+++ b/sql/log_event.cc	2012-08-22 08:31:12 +0000
@@ -2756,7 +2756,7 @@ Slave_worker *Log_event::get_slave_worke
       DBUG_ASSERT(num_dbs != OVER_MAX_DBS_IN_EVENT_MTS || !thd->temporary_tables);
       DBUG_ASSERT(!strcmp(mts_assigned_partitions[i]->db, *ref_cur_db));
       DBUG_ASSERT(ret_worker == mts_assigned_partitions[i]->worker);
-      DBUG_ASSERT(mts_assigned_partitions[i]->usage > 0);
+      DBUG_ASSERT(mts_assigned_partitions[i]->usage >= 0);
 
       i++;
     } while (it++);

=== modified file 'sql/rpl_rli_pdb.h'
--- a/sql/rpl_rli_pdb.h	2012-08-09 10:08:28 +0000
+++ b/sql/rpl_rli_pdb.h	2012-08-22 08:31:12 +0000
@@ -27,6 +27,10 @@ typedef struct st_db_worker_hash_entry
   uint  db_len;
   const char *db;
   Slave_worker *worker;
+  /*
+    The number of transaction pending on this database.
+    This should only be modified under the lock slave_worker_hash_lock.
+   */
   long usage;
   /*
     The list of temp tables belonging to @ db database is

No bundle (reason: useless for push emails).