List:Commits« Previous MessageNext Message »
From:Matthias Leich Date:June 25 2008 7:33pm
Subject:bzr push into mysql-6.0 tree (mleich:2683 to 2683) Bug#37492
View as plain text  
------------------------------------------------------------
revno: 2683
revision-id: mleich@stripped
parent: davi@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-6.0-bugteam-funcs_1
timestamp: Wed 2008-06-25 19:24:17 +0200
message:
  Upmerge 5.1 -> 6.0
added:
  mysql-test/include/wait_condition.inc wait_condition.inc-20080624105104-7a4ft3j7x0jit3kn-1
renamed:
  mysql-test/include/wait_condition.inc => mysql-test/include/wait_condition.inc.moved sp1f-wait_condition.inc-20070119153345-7o6xwtafogxivtonodp7akqbx2e4o3qk
modified:
  mysql-test/t/subselect.test    sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr
    ------------------------------------------------------------
    revno: 2497.253.9
    revision-id: mleich@stripped
    parent: gshchepa@stripped
    parent: mleich@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.1-bugteam-funcs_1
    timestamp: Wed 2008-06-25 19:01:17 +0200
    message:
      Upmerge 5.0 -> 5.1
    added:
      mysql-test/include/wait_condition.inc wait_condition.inc-20080624105104-7a4ft3j7x0jit3kn-1
    renamed:
      mysql-test/include/wait_condition.inc => mysql-test/include/wait_condition.inc.moved sp1f-wait_condition.inc-20070119153345-7o6xwtafogxivtonodp7akqbx2e4o3qk
    modified:
      mysql-test/t/subselect.test    sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr
    ------------------------------------------------------------
    revno: 1810.3738.12
    revision-id: mleich@stripped
    parent: gshchepa@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.0-bugteam-funcs_1
    timestamp: Wed 2008-06-25 16:59:38 +0200
    message:
      Fix for
      Bug#37492 timing bug in subselect.test
      + similar weaknesses found during testing
      + replace error numbers by error names
    added:
      mysql-test/include/wait_condition.inc wait_condition.inc-20080624105104-7a4ft3j7x0jit3kn-1
    modified:
      mysql-test/t/subselect.test    sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr

Attachment: [text/text/x-diff] patch-2683.diff
Thread
• bzr push into mysql-6.0 tree (mleich:2683 to 2683) Bug#37492Matthias Leich25 Jun