List:Commits« Previous MessageNext Message »
From:Luis Soares Date:November 15 2011 2:42pm
Subject:bzr push into mysql-trunk branch (luis.soares:3612 to 3613) Bug#11760927
View as plain text  
 3613 Luis Soares	2011-11-15 [merge]
      BUG#11760927
      
      Automerged mysql-5.5 into latest mysql-trunk.

    modified:
      sql/log_event.cc
 3612 Luis Soares	2011-11-15 [merge]
      BUG#11760927
            
      Manual merge from mysql-5.5 into latest mysql-trunk.
            
      Conflicts
      ---------
      Text conflict in sql/log_event.cc
      Text conflict in sql/rpl_rli.h
            
      Disabled warnings in test case when including master-slave.inc .

    added:
      mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
      mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
    modified:
      sql/log_event.cc
      sql/log_event.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-11-15 13:04:11 +0000
+++ b/sql/log_event.cc	2011-11-15 14:40:04 +0000
@@ -10643,7 +10643,7 @@ void issue_long_find_row_warning(Log_eve
     DBUG_EXECUTE_IF("inject_long_find_row_note", 
                     stmt_ts-=(LONG_FIND_ROW_THRESHOLD*2););
 
-    time_t delta= (now - stmt_ts);
+    long delta= (long) (now - stmt_ts);
 
     if (delta > LONG_FIND_ROW_THRESHOLD)
     {
@@ -10653,7 +10653,7 @@ void issue_long_find_row_warning(Log_eve
 
       sql_print_information("The slave is applying a ROW event on behalf of a%s statement "
                             "on table %s and is currently taking a considerable amount "
-                            "of time (%lu seconds). This is due to the fact that it is %s "
+                            "of time (%ld seconds). This is due to the fact that it is %s "
                             "while looking up records to be processed. Consider adding a "
                             "primary key (or unique key) to the table to improve "
                             "performance.", evt_type, table_name, delta, scan_type);

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (luis.soares:3612 to 3613) Bug#11760927Luis Soares16 Nov