bzr push into mysql-trunk branch (harin.vadodaria:4203 to 4204) WL#6443

[Harin Vadodaria]

 4204 Harin Vadodaria	2012-08-23
      wl#6443 : Deprecate features in mysql-5.6-rc - SrvGen
      
      Description : Fixing wl6443_deprecation.test failure
                    on solaris.

    modified:
      mysql-test/r/wl6443_deprecation.result
      mysql-test/t/wl6443_deprecation.test
 4203 Harin Vadodaria	2012-08-21
      wl#6443 : Deprecate features in mysql-5.6-rc - SrvGen
      
      Description : Introduced deprecation warnings for
                    1. max_tmp_tables, date_format, time_format,
                       datetime_format system variables.
                    2. SHOW PROFILE and SHOW PROFILES statements.
                    3. --plugin-xxx syntax.

    added:
      mysql-test/r/wl6443_deprecation.result
      mysql-test/t/wl6443_deprecation-master.opt
      mysql-test/t/wl6443_deprecation.test
    modified:
      include/my_getopt.h
      mysql-test/r/show_profile.result
      mysql-test/r/variables.result
      mysql-test/suite/rpl/r/rpl_spec_variables.result
      mysql-test/suite/rpl/t/rpl_spec_variables.test
      mysql-test/suite/sys_vars/r/date_format_basic.result
      mysql-test/suite/sys_vars/r/datetime_format_basic.result
      mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
      mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
      mysql-test/suite/sys_vars/r/thread_concurrency_basic.result
      mysql-test/suite/sys_vars/r/time_format_basic.result
      mysql-test/t/profiling.test
      sql/item_func.cc
      sql/set_var.cc
      sql/set_var.h
      sql/share/errmsg-utf8.txt
      sql/sql_plugin.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
=== modified file 'mysql-test/r/wl6443_deprecation.result'
--- a/mysql-test/r/wl6443_deprecation.result	2012-08-21 08:11:45 +0000
+++ b/mysql-test/r/wl6443_deprecation.result	2012-08-23 10:43:59 +0000
@@ -57,5 +57,5 @@ INSTALL PLUGIN validate_password SONAME
 # Restart server.
 UNINSTALL PLUGIN validate_password;
 # Search for deprecation warnings in error log.
-# YMMDD HH:MM:SS [Warning] The syntax 'plugin-XYZ' is deprecated and will be removed in a future release. Please use XYZ instead.
+# YMMDD HH:MM:SS [Warning] The syntax 'plugin-validate-password-length' is deprecated and will be removed in a future release. Please use validate-password-length instead.
 Deprecation warning count : 1

=== modified file 'mysql-test/t/wl6443_deprecation.test'
--- a/mysql-test/t/wl6443_deprecation.test	2012-08-21 08:11:45 +0000
+++ b/mysql-test/t/wl6443_deprecation.test	2012-08-23 10:43:59 +0000
@@ -55,7 +55,7 @@ eval INSTALL PLUGIN validate_password SO
 UNINSTALL PLUGIN validate_password;
 
 --echo # Search for deprecation warnings in error log.
---echo # YMMDD HH:MM:SS [Warning] The syntax 'plugin-XYZ' is deprecated and will be removed in a future release. Please use XYZ instead.
+--echo # YMMDD HH:MM:SS [Warning] The syntax 'plugin-validate-password-length' is deprecated and will be removed in a future release. Please use validate-password-length instead.
 --let $log_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
 --let LOGF= $log_file
 
@@ -63,7 +63,7 @@ perl;
   use strict;
   my $logf= $ENV{'LOGF'} or die "LOGF not set";
   open(FILE, "$logf") or die("Unable to open $logf: $!\n");
-  my $count_warnings= grep(/\[Warning\] The syntax 'plugin-.*' is deprecated and will be removed in a future release\. Please use .* instead\./gi,<FILE>);
+  my $count_warnings= grep(/\[Warning\] The syntax 'plugin-validate-password-length' is deprecated and will be removed in a future release\. Please use validate-password-length instead\./gi,<FILE>);
   my $count_warnings= $count_warnings;
   print "Deprecation warning count : $count_warnings\n";
   close(FILE);

No bundle (reason: useless for push emails).