bzr push into mysql-trunk branch (Georgi.Kodinov:3808 to 3809) Bug#13586336

[Georgi Kodinov]

 3809 Georgi Kodinov	2012-01-31
      Addendum to the fix for bug #13586336
      Suppressed the warnings in the pre-existing test change_user 
      because this test is also run in embedded where the 
      authentication checks are not compiled, so no warnings are 
      emitted.

    modified:
      mysql-test/r/change_user.result
      mysql-test/t/change_user.test
 3808 Tor Didriksen	2012-01-31 [merge]
      merge opt-team => trunk

    modified:
      mysql-test/r/derived.result
      mysql-test/r/func_in_all.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/join_cache_bka.result
      mysql-test/r/join_cache_bka_nixbnl.result
      mysql-test/r/join_cache_bkaunique.result
      mysql-test/r/join_cache_bnl.result
      mysql-test/r/join_cache_nojb.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/optimizer_debug_sync.result
      mysql-test/r/order_by_all.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_bka.result
      mysql-test/r/subselect_innodb.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
      mysql-test/t/group_by.test
      mysql-test/t/optimizer_debug_sync.test
      sql/item.cc
      sql/sql_priv.h
=== modified file 'mysql-test/r/change_user.result'
--- a/mysql-test/r/change_user.result	2012-01-30 15:43:32 +0000
+++ b/mysql-test/r/change_user.result	2012-01-31 11:00:26 +0000
@@ -3,8 +3,6 @@ Warnings:
 Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 grant select on test.* to test_nopw;
 grant select on test.* to test_oldpw identified by password "09301740536db389";
-Warnings:
-Warning	1287	'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
 grant select on test.* to test_newpw identified by "newpw";
 select user(), current_user(), database();
 user()	current_user()	database()

=== modified file 'mysql-test/t/change_user.test'
--- a/mysql-test/t/change_user.test	2012-01-30 15:43:32 +0000
+++ b/mysql-test/t/change_user.test	2012-01-31 11:00:26 +0000
@@ -4,7 +4,10 @@
 
 SET GLOBAL secure_auth = OFF;
 grant select on test.* to test_nopw;
+# need to suppress the deprecation warnings because they're absent in embedded
+--disable_warnings
 grant select on test.* to test_oldpw identified by password "09301740536db389";
+--enable_warnings
 grant select on test.* to test_newpw identified by "newpw";
 
 select user(), current_user(), database();

No bundle (reason: useless for push emails).