List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:August 18 2008 8:15pm
Subject:bzr push into mysql-6.0 branch (sven:2770 to 2771)
View as plain text  
 2771 Sven Sandberg	2008-08-18
      empty commit to force pushbuild to rebuild

 2770 Sven Sandberg	2008-08-18 [merge]
      merge 6.0-rpl-testfixes -> 6.0
      The following conflicts were resolved manually:
      Path conflict: <deleted> / mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
      Conflict adding file mysql-test/t/innodb_bug35220.test.  Moved existing file to mysql-test/t/innodb_bug35220.test.moved.
removed:
  mysql-test/t/innodb_bug35220.test
added:
  mysql-test/t/innodb_bug35220.test
Thread
• bzr push into mysql-6.0 branch (sven:2770 to 2771) Sven Sandberg18 Aug