From: Joerg Bruehe
Date: September 28 2011 9:31am
Subject: bzr push into mysql-trunk branch (joerg.bruehe:3445 to 3446)
List-Archive: http://lists.mysql.com/commits/141177
Message-Id: <201109280932.p8S9WQfw003448@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3446 Joerg Bruehe	2011-09-28 [merge]
      Empty upmerge: version number change 5.5.17 -> 18 does not affect 5.6.

 3445 Tor Didriksen	2011-09-28
      fix .result files after merge

    modified:
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
No bundle (reason: useless for push emails).