From: Manish Kumar
Date: October 24 2012 12:32pm
Subject: bzr push into mysql-trunk branch (manish.4.kumar:4811 to 4812) Bug#14775984
List-Archive: http://lists.mysql.com/commits/145105
X-Bug: 14775984
Message-Id: <201210241232.q9OCWpZ1019393@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4812 Manish Kumar	2012-10-24 [merge]
      BUG#14775984 - RENAME GTID IDENTIFIERS 
      
      Upmerge from mysql-5.6 -> mysql-trunk

    modified:
      mysql-test/r/mysqld--help-win.result
 4811 Jimmy Yang	2012-10-24 [merge]
      Merge from mysql-5.6 to mysql-trunk

    modified:
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      storage/innobase/row/row0sel.cc
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-10-24 08:45:32 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-10-24 12:31:21 +0000
@@ -1014,10 +1014,10 @@ delay-key-write ON
 delayed-insert-limit 100
 delayed-insert-timeout 300
 delayed-queue-size 1000
-enforce-gtid-consistency FALSE
 disconnect-slave-event-count 0
 div-precision-increment 4
 end-markers-in-json FALSE
+enforce-gtid-consistency FALSE
 eq-range-index-dive-limit 10
 event-scheduler OFF
 expire-logs-days 0

No bundle (reason: useless for push emails).