From: Tor Didriksen
Date: January 3 2011 1:38pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3450 to 3451)
List-Archive: http://lists.mysql.com/commits/127790
Message-Id: <20110103133836.811AC3753@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3451 Tor Didriksen	2011-01-03 [merge]
      NULL merge from 5.5

 3450 Guilhem Bichot	2010-12-31 [merge]
      merge from 5.5

    renamed:
      mysql-test/suite/funcs_1/r/myisam_views.result => mysql-test/suite/funcs_1/r/myisam_views-big.result
      mysql-test/suite/funcs_1/t/myisam_views.test => mysql-test/suite/funcs_1/t/myisam_views-big.test
    modified:
      mysql-test/collections/default.experimental
      mysql-test/collections/default.weekly
      mysql-test/suite/funcs_1/t/myisam_views-big.test
No bundle (reason: useless for push emails).