bzr push into mysql-trunk branch (bjorn.munch:3975 to 3976)

[Bjorn Munch]

 3976 Bjorn Munch	2012-06-08
      Fix RPM spec file so SuSE 11.1 is treated as 11

    modified:
      support-files/mysql.spec.sh
 3975 Kristofer Pettersson	2012-06-08 [merge]
      WL5602 Providing password hashing with appropriate strength
      
      Features:
      * New authentication plugin 'sha256_password' which requires
        either SSL or RSA key exchange.
      * The plugin uses a new password store which uses a salted
        SHA-256 based hash digest.
      * Introduction of default authentication plugin server side option.
      
      Misc:
      * Some refactoring of legacy code related to passwords and 
       the user table.

    added:
      include/crypt_genhash_impl.h
      include/mysql/client_authentication.h
      mysql-test/r/plugin_auth_sha256_server_default_tls.result
      mysql-test/r/plugin_auth_sha256_tls.result
      mysql-test/std_data/rsa_private_key.pem
      mysql-test/std_data/rsa_public_key.pem
      mysql-test/suite/sha256_auth/
      mysql-test/suite/sha256_auth/inc/
      mysql-test/suite/sha256_auth/r/
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256.result
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256_2.result
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256_server_default.result
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256_tls.result
      mysql-test/suite/sha256_auth/t/
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256-master.opt
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256.test
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2-master.opt
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2.test
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default-master.opt
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default.test
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_tls.test
      mysql-test/suite/sys_vars/r/sha256_password_private_key_path_basic.result
      mysql-test/suite/sys_vars/r/sha256_password_public_key_path_basic.result
      mysql-test/suite/sys_vars/t/sha256_password_private_key_path_basic.test
      mysql-test/suite/sys_vars/t/sha256_password_public_key_path_basic.test
      mysql-test/t/plugin_auth_sha256_server_default_tls-master.opt
      mysql-test/t/plugin_auth_sha256_server_default_tls.test
      mysql-test/t/plugin_auth_sha256_tls.test
      sql-common/client_authentication.cc
      sql-common/crypt_genhash_impl.cc
    modified:
      client/client_priv.h
      client/mysql.cc
      client/mysqltest.cc
      include/mysql.h
      include/mysql.h.pp
      include/mysql_com.h
      include/password.h
      include/sql_common.h
      libmysql/CMakeLists.txt
      libmysql/client_settings.h
      mysql-test/include/mysqld--help.inc
      mysql-test/r/change_user.result
      mysql-test/r/connect.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/func_crypt.result
      mysql-test/r/grant.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/openssl_1.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/plugin_auth_qa.result
      mysql-test/r/plugin_auth_qa_1.result
      mysql-test/r/plugin_auth_qa_2.result
      mysql-test/suite/funcs_1/r/is_user_privileges.result
      mysql-test/suite/rpl/r/rpl_master_connection.result
      mysql-test/suite/sys_vars/r/old_passwords_basic.result
      mysql-test/suite/sys_vars/r/old_passwords_func.result
      mysql-test/suite/sys_vars/r/secure_auth_func.result
      mysql-test/suite/sys_vars/t/old_passwords_basic.test
      mysql-test/suite/sys_vars/t/old_passwords_func.test
      mysql-test/suite/sys_vars/t/secure_auth_func.test
      mysql-test/t/change_user.test
      mysql-test/t/connect.test
      mysql-test/t/ctype_ucs.test
      mysql-test/t/disabled.def
      mysql-test/t/func_crypt.test
      mysql-test/t/mysql_upgrade.test
      mysql-test/t/openssl_1.test
      mysql-test/t/plugin_auth.test
      mysql-test/t/plugin_auth_qa.test
      sql-common/client.c
      sql/CMakeLists.txt
      sql/client_settings.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/password.c
      sql/set_var.cc
      sql/share/errmsg-utf8.txt
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_class.h
      sql/sql_parse.cc
      sql/sql_rewrite.cc
      sql/sql_yacc.yy
      sql/structs.h
      sql/sys_vars.cc
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-06-05 12:03:10 +0000
+++ b/support-files/mysql.spec.sh	2012-06-08 13:36:12 +0000
@@ -176,7 +176,7 @@
         %endif
       %else
         %if %(test -f /etc/SuSE-release && echo 1 || echo 0)
-          %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release)
+          %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1)
           %if "%susever" == "10"
             %define distro_description    SUSE Linux Enterprise Server 10
             %define distro_releasetag     sles10

No bundle (reason: useless for push emails).