bzr push into mysql-trunk branch (nirbhay.choubey:3779 to 3780) WL#5603

[Nirbhay Choubey]

 3780 Nirbhay Choubey	2012-05-29
      WL#5603 : Revise how we handle passwords on
                the command line
      
      * Minor modifications.

    added:
      mysql-test/std_data/.mylogin.cnf
    modified:
      extra/yassl/taocrypt/include/misc.hpp
      mysql-test/r/mysql_config_editor.result
      mysql-test/t/mysql_config_editor.test
 3779 Nirbhay Choubey	2012-05-29
      WL#5603 : Revise how we handle passwords on
                the command line
      
      * Addressed review comments & a suggestion from Tor.
      * Improved test case.
      * Re-removed mysys/my_aes.c, which slipped back in
        accidently in last update to the WL tree.

    removed:
      mysys/my_aes.c
    modified:
      client/mysql_config_editor.cc
      extra/my_print_defaults.c
      extra/yassl/taocrypt/include/misc.hpp
      mysql-test/r/mysql_config_editor.result
      mysql-test/t/mysql_config_editor.test
      mysys/CMakeLists.txt
      mysys_ssl/default.c
      mysys_ssl/my_default.h
=== modified file 'extra/yassl/taocrypt/include/misc.hpp'
--- a/extra/yassl/taocrypt/include/misc.hpp	2012-05-29 04:43:42 +0000
+++ b/extra/yassl/taocrypt/include/misc.hpp	2012-05-29 07:55:01 +0000
@@ -701,12 +701,7 @@ inline void PutWord(bool assumeAligned,
         UnalignedPutWord(order, block, value, xorBlock);
 }
 
-
-/*
-  XXX MYSQL: Setting A (assumeAligned) to false,
-  keeping it true might trigger segfault on SPARC.
-*/
-template <class T, class B, bool A= false>
+template <class T, class B, bool A=true>
 class GetBlock
 {
 public:
@@ -726,11 +721,7 @@ private:
     const byte *m_block;
 };
 
-/*
-  XXX MYSQL: Setting A (assumeAligned) to false,
-  keeping it true might trigger segfault on SPARC.
-*/
-template <class T, class B, bool A= false>
+template <class T, class B, bool A = true>
 class PutBlock
 {
 public:
@@ -752,7 +743,11 @@ private:
     byte *m_block;
 };
 
-template <class T, class B, bool A=true>
+/*
+  XXX MYSQL: Setting A (assumeAligned) to false,
+  keeping it true might trigger segfault on SPARC.
+*/
+template <class T, class B, bool A= false>
 struct BlockGetAndPut
 {
     // function needed because of C++ grammatical ambiguity between

=== modified file 'mysql-test/r/mysql_config_editor.result'
--- a/mysql-test/r/mysql_config_editor.result	2012-05-29 04:43:42 +0000
+++ b/mysql-test/r/mysql_config_editor.result	2012-05-29 07:55:01 +0000
@@ -212,6 +212,16 @@ DROP USER test_user1, test_user2;
 # Resetting the test login file
 ###############################
 # done..
+
+####################################
+# Testing with an invalid login file
+####################################
+# mysql_config_editor.test
+This is non-standard test login file.
+# The 'invalid' login file should not cause
+# any problem.
+#
+mysqld is alive
 ###############################
 # Dropping the test login file
 ###############################

=== added file 'mysql-test/std_data/.mylogin.cnf'
--- a/mysql-test/std_data/.mylogin.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/std_data/.mylogin.cnf	2012-05-29 07:55:01 +0000
@@ -0,0 +1,2 @@
+# mysql_config_editor.test
+This is non-standard test login file.

=== modified file 'mysql-test/t/mysql_config_editor.test'
--- a/mysql-test/t/mysql_config_editor.test	2012-05-29 04:43:42 +0000
+++ b/mysql-test/t/mysql_config_editor.test	2012-05-29 07:55:01 +0000
@@ -166,6 +166,20 @@ DROP USER test_user1, test_user2;
 --echo ###############################
 --exec $MYSQL_CONFIG_EDITOR reset
 --echo # done..
+
+--echo
+--echo ####################################
+--echo # Testing with an invalid login file
+--echo ####################################
+--remove_file $MYSQL_TEST_LOGIN_FILE
+--copy_file std_data/.mylogin.cnf $MYSQL_TEST_LOGIN_FILE
+--cat_file $MYSQL_TEST_LOGIN_FILE
+
+--echo # The 'invalid' login file should not cause
+--echo # any problem.
+--echo #
+--exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping 2>&1
+
 --echo ###############################
 --echo # Dropping the test login file
 --echo ###############################

No bundle (reason: useless for push emails).