bzr push into mysql-trunk branch (venkata.sidagam:4132 to 4133) Bug#12876932

[Venkata Sidagam]

 4133 Venkata Sidagam	2012-07-26 [merge]
      Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE
                        
      Merged pb2 test failure fix from mysql-5.6 to mysql-trunk

    modified:
      mysql-test/suite/funcs_1/t/is_engines_federated.test
 4132 Nirbhay Choubey	2012-07-26 [merge]
      Merge of patch for Bug#13741677 from mysql-5.6.

    modified:
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
=== modified file 'mysql-test/suite/funcs_1/t/is_engines_federated.test'
--- a/mysql-test/suite/funcs_1/t/is_engines_federated.test	2009-01-31 19:22:59 +0000
+++ b/mysql-test/suite/funcs_1/t/is_engines_federated.test	2012-07-26 17:53:04 +0000
@@ -9,7 +9,7 @@
 #
 
 let $engine_type= FEDERATED;
---source suite/federated/have_federated_db.inc
+--source suite/federated/include/have_federated_db.inc
 --vertical_results
 eval SELECT * FROM information_schema.engines
 WHERE ENGINE = '$engine_type';

No bundle (reason: useless for push emails).