bzr push into mysql-5.1 branch (venkata.sidagam:3780 to 3781) Bug#12876932

[Venkata Sidagam]

 3781 Venkata Sidagam	2012-07-26
      Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE
      
      Fix for pb2 test failure.

    modified:
      mysql-test/suite/funcs_1/t/is_engines_federated.test
 3780 Nirbhay Choubey	2012-07-26
      Bug#13741677 MYSQL_SECURE_INSTALLATION DOES NOT
                   WORK + SAVES ROOT PASSWORD TO DISK!
      
      The secure installation scripts connect to the
      server by storing the password in a temporary
      option file. Now, if the script gets killed or
      fails for some reason, the removal of the option
      file may not take place.
      
      This patch introduces following enhancements :
      * (.sh) Made sure that cleanup happens at every
        call to 'exit 1'. This is performed implicitly
        by END{} in pl.in.
      * (.pl.in) Added a warning in case unlink fails
        to delete the option/query files.
      * (.sh/.pl.in) Added more signals to the signal
        handler list. SIG# 1, 3, 6, 15

    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).