bzr push into mysql-trunk branch (marc.alff:4970 to 4971)

[Marc Alff]

 4971 Marc Alff	2012-11-12 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      mysql-test/suite/perfschema/t/rpl_gtid_func.test
 4970 bjorn.munch@stripped	2012-11-12 [merge]
      Null upmerge of version number change

=== modified file 'mysql-test/suite/perfschema/t/rpl_gtid_func.test'
--- a/mysql-test/suite/perfschema/t/rpl_gtid_func.test	2012-11-08 21:40:31 +0000
+++ b/mysql-test/suite/perfschema/t/rpl_gtid_func.test	2012-11-12 10:41:04 +0000
@@ -1,3 +1,7 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source ../include/no_protocol.inc
+
 -- source include/master-slave.inc
 
 connection master;

No bundle (reason: useless for push emails).