bzr push into mysql-trunk-wl5597 branch (luis.soares:3658 to 3659) WL#5597

[Luis Soares]

 3659 Luis Soares	2012-02-17
      WL#5597 
      
      There were a missing braces in an 'if' inside 
      Rows_log_event::do_post_row_operations .
      
      Also refactored rpl_bug26395 a bit.

    modified:
      mysql-test/suite/rpl/r/rpl_bug26395.result
      mysql-test/suite/rpl/t/rpl_bug26395.test
      sql/log_event.cc
 3658 Luis Soares	2012-02-17
      WL#5597
      
      Updating the collection name and var dir when running with HASH_SCAN on.

    modified:
      mysql-test/collections/mysql-trunk-wl5597.push
=== modified file 'mysql-test/suite/rpl/r/rpl_bug26395.result'
--- a/mysql-test/suite/rpl/r/rpl_bug26395.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug26395.result	2012-02-17 18:24:06 +0000
@@ -22,17 +22,10 @@ a
 include/sync_slave_io_with_master.inc
 ==== Verify results on slave ====
 include/stop_slave.inc
-SELECT "" AS Slave_IO_State;
-Slave_IO_State
-
-SELECT "" AS Last_SQL_Error;
-Last_SQL_Error
-
-SELECT "" AS Last_IO_Error;
-Last_IO_Error
-
-SELECT * FROM tinnodb ORDER BY a;
-a
+Slave_IO_State = ''
+Last_SQL_Error = ''
+Last_IO_Error = ''
+include/assert.inc [Assert that the slave table has no rows]
 ==== Clean up ====
 [on master]
 DROP TABLE tinnodb;

=== modified file 'mysql-test/suite/rpl/t/rpl_bug26395.test'
--- a/mysql-test/suite/rpl/t/rpl_bug26395.test	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug26395.test	2012-02-17 18:24:06 +0000
@@ -74,14 +74,13 @@ sync_with_master 0;
 --echo ==== Verify results on slave ====
 
 source include/stop_slave.inc;
-let $tmp= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1);
-eval SELECT "$tmp" AS Slave_IO_State;
-let $tmp= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
-eval SELECT "$tmp" AS Last_SQL_Error;
-let $tmp= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1);
-eval SELECT "$tmp" AS Last_IO_Error;
-SELECT * FROM tinnodb ORDER BY a;
 
+--let $status_items=Slave_IO_State,Last_SQL_Error,Last_IO_Error
+--source include/show_slave_status.inc
+
+--let $assert_text= Assert that the slave table has no rows
+--let $assert_cond= `SELECT COUNT(*) = 0 FROM tinnodb`
+--source include/assert.inc
 
 --echo ==== Clean up ====
 

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2012-02-13 19:05:40 +0000
+++ b/sql/log_event.cc	2012-02-17 18:24:06 +0000
@@ -9141,8 +9141,10 @@ void Rows_log_event::do_post_row_operati
   m_curr_row= m_curr_row_end;
   
   if (error == 0 && !m_table->file->has_transactions())
+  {
     thd->transaction.all.set_unsafe_rollback_flags(TRUE);
     thd->transaction.stmt.set_unsafe_rollback_flags(TRUE);
+  }
   
 }
 

No bundle (reason: useless for push emails).