bzr push into mysql-next-mr-bugfixing branch (jorgen.loland:3273 to 3274) Bug#34750

[Jorgen Loland]

 3274 Jorgen Loland	2010-09-06
      BUG#34750: Print database name in Unknown Table error message
      
      Followup patch - update result file for 
      partition_not_blackhole test
     @ mysql-test/r/partition_not_blackhole.result
        Updated warning output for drop view/drop table: database name is now printed.

    modified:
      mysql-test/r/partition_not_blackhole.result
 3273 Dao-Gang.Qu@stripped	2010-09-04
      Bug #53167  	Seconds_Behind_Master is wrong after start slave
      
      When a slave server has an existing relay log and the user issues
      START SLAVE, the output from "SHOW SLAVE STATUS" shows a wrong
      value for Seconds_Behind_Master until the first event from the relay
      log has finished executing. The displayed value for Seconds_Behind_Master
      is calculated based on the timestamp of the Format_Description_Log_Event,
      which is reinserted into stream of events in RL when RL rotates. This can
      be a very big number if the previous relay log was created long ago. And
      the first FD generated by slave, which refers to incomparable time generated
      on slave.
      
      Do not assign the Timestamp of the Format_Description_Log_Event to
      last_master_timestamp when executing the Format_Description_Log_Event
      on slave. Then the peak value will disappear.
     @ mysql-test/suite/rpl/t/rpl_delayed_slave.test
        Updated to test the patch of Bug #53167.
     @ sql/binlog.cc
        Added code to set LOG_EVENT_RELAY_LOG_F flag for relay log's FD
     @ sql/rpl_slave.cc
        Added code to not update the last_master_timestamp by the Timestamp
        recorded in FD from master.

    modified:
      mysql-test/suite/rpl/t/rpl_delayed_slave.test
      sql/binlog.cc
      sql/rpl_slave.cc
=== modified file 'mysql-test/r/partition_not_blackhole.result'
--- a/mysql-test/r/partition_not_blackhole.result	2010-07-08 12:36:55 +0000
+++ b/mysql-test/r/partition_not_blackhole.result	2010-09-06 07:27:38 +0000
@@ -11,6 +11,6 @@ t1
 SHOW CREATE TABLE t1;
 ERROR HY000: Incorrect information in file: './test/t1.frm'
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 t1.frm
 t1.par


Attachment: [text/bzr-bundle] bzr/[e-mail]