From: Jorgen Loland
Date: September 6 2010 7:27am
Subject: bzr push into mysql-next-mr-bugfixing branch (jorgen.loland:3273 to 3274)
 Bug#34750
List-Archive: http://lists.mysql.com/commits/117567
X-Bug: 34750
Message-Id: <20100906072754.D23466EF@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5309018901234334874=="

--===============5309018901234334874==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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


--===============5309018901234334874==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jorgen.loland@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   ugb051ustfp90ox9
# target_branch: file:///export/home/jl208045/mysql/mysql-next-mr-\
#   bugfixing-30597/
# testament_sha1: c46cd367407d8e45d28aa559a8d7942352cd6f48
# timestamp: 2010-09-06 09:27:54 +0200
# base_revision_id: dao-gang.qu@stripped\
#   gvh3h25jkw8bnmom
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTbxMooAAZnfgEAQWOP/91OU
3gC////wUAQOvD1TkKBoA0RJiGjNJj1TQ0AANAAMgHMAmAEwAAmAAJgADJU0wZTyQMgaAABoAANA
00SnkmpvSjQ9Q/Un6SYQxqA0GQyPUwkkE00AjEE9IyMkzU1HoNINPUHqbAyV0+qCFJGRBphqsEBU
bVGt1b7nh+rwhntmZjtyL004YmqhbV1wyEGBjFiD83QcLxFW7Y5vz+ewwOZh2tfl0WY2St6SUZCd
LgmOYXioBBUmVMZPEjEOCh6Irq4AVdtWU6kyWjkr08s16RsjfZKQtRk5jimSVpqEnUvX4k9VQJL8
i1bKBRD9FwE1L0FdVQOT00hWiu4yJEkLvluN3NnYUpqJRLbHu+mUDBflQ8LIrzN3BY3Z6k1e3NrM
zPCkXS+qh7lFyFy32R2LZyV0xTovW3xnnTQFHq6HPxUpyFGzPq0P34gYAxdf3VLzwaUBqPBxRkfv
sEsLr7ttRE3+m8kx3teX6L/q5sU42lq8EwrKOsXwoodKHw23ZgiLrGUkoLBt1pEDVOKiihQRysZO
Wksw0AVgrfau3E2vok5Z0lcxYGuyltJxlVzy+agthYxWm22IOgp3mMsTeX3XtF1xYrbSM2renNlJ
mTT25NJtT4DyMJOR4WBUUAUQMxXoowW9IU9nxivORP9KYISZfTMLnR9j+rDldYQ/CEpiVIChF16F
BAxY6/CbwxuObKEtAFvdU4tUA8b1N9IH0Wi87EeTCn5EOJQRYZxdumLqP5zJnQ2O2R+BPTlp+vMN
tm4tt3j+mRv7Nt7MJfZIvhSemLsML451nGabhSnwTJVrvOBaVF7zw8qJ+urtuDiYmb0LLdGh3e+k
hx2O+ZPpKWRY6JIPHEtO7jSU9xJmNUTKwTL4GnavGAKx6IUjz1ZZTx2cyPQm+iNhZHa7sNeRAgby
Z728u9nZ77x4QvEz0fddFmK4xZDAOesPZN3rsVb9wWUKOCoMq3Nd5WMmhLQ2CeaysK5T+1Z77b5Y
BWKu4HC0u2qjn7b14r5Lr1PuNhq0A7A2lNSrNAuC7R69+YvQC5xzHtcA4c9jw0h4ZpWOVzt0RG7R
3crqx4zdry04Q2qiJyYajL1c0sFBJwipUlAMk+TwenV+xkvVcBT6FVVYzJmTJ+NiR0rnjJ3H7cJE
hRZvITswWisBgT6AM4E7xLpmomQtWblq+wuETVhUKnuZl59XeLnwhPjMqvhRQ6/kvddl4fJVLts5
X8lEF4VSRfMvxeU0gNV8a4KeqPUj20lApebLk+eKplAuM2spBqSxp7tanUuDI3CrBy4p0Y9tDO9a
jbRrFGESBsHuHtB8rvjF9KaIpE5bLTIThUBWrmeyhTsWX1uF2caxddTp/gWmv3vXsvKegYyd6KD1
u1OFnQElYvr0UVgxRd/4u5IpwoSBt4mUUA==


--===============5309018901234334874==--