bzr commit into mysql-6.0 tree (dlenev:2643) Bug#27430, WL#3726

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-6.0-3726-w/

------------------------------------------------------------
revno: 2643
revision-id: dlenev@stripped
parent: dlenev@stripped
parent: konstantin@stripped
committer: Dmitry Lenev <dlenev@stripped>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 22:07:44 +0400
message:
  Merge of fix for assert failures in kill.test caused by
  WL#3726 "DDL locking for all metadata objects" with recent
  changes to mysql-6.0-3276.
added:
  .bzr-mysql/                    bzrmysql-20080522222659-2k8yxpl0qqai5osk-1
  .bzr-mysql/default.conf        default.conf-20080522222659-2k8yxpl0qqai5osk-2
modified:
  mysql-test/r/merge.result     
sp1f-merge.result-20001228015634-pf2nbswryog4ykgcx7icbva7tgga7ppt
  mysql-test/t/merge.test       
sp1f-merge.test-20001228015636-6f5h74kivnnxupyw56zl2jueijh5rb3x
    ------------------------------------------------------------
    revno: 2641.1.1
    revision-id: konstantin@stripped
    parent: dlenev@stripped
    parent: konstantin@stripped
    committer: Konstantin Osipov <konstantin@stripped>
    branch nick: mysql-6.0-3726
    timestamp: Sat 2008-05-24 15:13:56 +0400
    message:
      Merge with the latest 6.0-runtime
    added:
      .bzr-mysql/                    bzrmysql-20080522222659-2k8yxpl0qqai5osk-1
      .bzr-mysql/default.conf        default.conf-20080522222659-2k8yxpl0qqai5osk-2
    modified:
      mysql-test/r/merge.result     
sp1f-merge.result-20001228015634-pf2nbswryog4ykgcx7icbva7tgga7ppt
      mysql-test/t/merge.test       
sp1f-merge.test-20001228015636-6f5h74kivnnxupyw56zl2jueijh5rb3x
    ------------------------------------------------------------
    revno: 2638.1.5
    revision-id: konstantin@stripped
    parent: konstantin@stripped
    committer: Konstantin Osipov <konstantin@stripped>
    branch nick: mysql-6.0-runtime
    timestamp: Fri 2008-05-23 04:08:03 +0400
    message:
      Tweak the commit message.
    modified:
      .bzr-mysql/default.conf        default.conf-20080522222659-2k8yxpl0qqai5osk-2
    ------------------------------------------------------------
    revno: 2638.1.4
    revision-id: konstantin@stripped
    parent: konstantin@stripped
    committer: Konstantin Osipov <konstantin@stripped>
    branch nick: mysql-6.0-runtime
    timestamp: Fri 2008-05-23 02:42:32 +0400
    message:
      Bug#27430 "Crash in subquery code when in PS and table DDL changed after
      PREPARE"
      Add a test case for the situation with small TDC and many merge children.
    modified:
      mysql-test/r/merge.result     
sp1f-merge.result-20001228015634-pf2nbswryog4ykgcx7icbva7tgga7ppt
      mysql-test/t/merge.test       
sp1f-merge.test-20001228015636-6f5h74kivnnxupyw56zl2jueijh5rb3x
    ------------------------------------------------------------
    revno: 2638.1.3
    revision-id: konstantin@stripped
    parent: konstantin@stripped
    committer: Konstantin Osipov <konstantin@stripped>
    branch nick: mysql-6.0-runtime
    timestamp: Fri 2008-05-23 02:40:55 +0400
    message:
      Update commit mail configuration.
    modified:
      .bzr-mysql/default.conf        default.conf-20080522222659-2k8yxpl0qqai5osk-2
    ------------------------------------------------------------
    revno: 2638.1.2
    revision-id: konstantin@stripped
    parent: konstantin@stripped
    committer: Konstantin Osipov <konstantin@stripped>
    branch nick: mysql-6.0-runtime
    timestamp: Fri 2008-05-23 02:30:24 +0400
    message:
      Now fix the syntax.
    modified:
      .bzr-mysql/default.conf        default.conf-20080522222659-2k8yxpl0qqai5osk-2
    ------------------------------------------------------------
    revno: 2638.1.1
    revision-id: konstantin@stripped
    parent: sp1r-kostja@bodhi.(none)-20080522065447-59365
    committer: Konstantin Osipov <konstantin@stripped>
    branch nick: mysql-6.0-runtime
    timestamp: Fri 2008-05-23 02:27:45 +0400
    message:
      Add settings for commit mails.
    added:
      .bzr-mysql/                    bzrmysql-20080522222659-2k8yxpl0qqai5osk-1
      .bzr-mysql/default.conf        default.conf-20080522222659-2k8yxpl0qqai5osk-2

Attachment: [text/text/x-diff] patch-2643.diff