List:Commits« Previous MessageNext Message »
From:Harin Vadodaria Date:August 21 2012 8:45am
Subject:bzr push into mysql-trunk branch (harin.vadodaria:4202 to 4203) WL#6443
View as plain text  
 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
 4202 Marko Mäkelä	2012-08-09 [merge]
      Merge mysql-5.6 to mysql-trunk.

=== modified file 'include/my_getopt.h'
--- a/include/my_getopt.h	2012-06-29 11:56:41 +0000
+++ b/include/my_getopt.h	2012-08-21 08:11:45 +0000
@@ -67,7 +67,11 @@ struct my_option
                                            If an opton needs neither special
                                            treatment in the my_get_one_option()
                                            nor one-letter short equivalent
-                                           use id=0
+                                           use id=0.
+                                           id=-1 is a special case and is used
+                                           to generate deprecation warnings for
+                                           plugin options. It should not be
+                                           used for anything else.
                                          */
   const char *comment;                  /**< option comment, for autom. --help.
                                            if it's NULL the option is not

=== modified file 'mysql-test/r/show_profile.result'
--- a/mysql-test/r/show_profile.result	2010-02-05 16:31:34 +0000
+++ b/mysql-test/r/show_profile.result	2012-08-21 08:11:45 +0000
@@ -5,6 +5,8 @@ SELECT 1;
 SHOW PROFILES;
 Query_ID	Duration	Query
 1	#	SELECT 1
+Warnings:
+Warning	#	'SHOW PROFILES' is deprecated and will be removed in a future release. Please use Performance Schema instead
 SHOW PROFILE FOR QUERY 1;
 SHOW PROFILE CPU FOR QUERY 1;
 SET profiling = 0;

=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2012-06-07 11:48:56 +0000
+++ b/mysql-test/r/variables.result	2012-08-21 08:11:45 +0000
@@ -520,6 +520,8 @@ Warning	1292	Truncated incorrect max_hea
 set max_join_size=100;
 set max_sort_length=100;
 set max_tmp_tables=100;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 set global max_user_connections=100;
 select @@max_user_connections;
 @@max_user_connections

=== added file 'mysql-test/r/wl6443_deprecation.result'
--- a/mysql-test/r/wl6443_deprecation.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/wl6443_deprecation.result	2012-08-21 08:11:45 +0000
@@ -0,0 +1,61 @@
+select @@global.max_tmp_tables;
+@@global.max_tmp_tables
+32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+select @@local.max_tmp_tables;
+@@local.max_tmp_tables
+32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+set @default_max_tmp_tables= @@global.max_tmp_tables;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+select @@global.date_format;
+@@global.date_format
+%Y-%m-%d
+Warnings:
+Warning	1287	'@@date_format' is deprecated and will be removed in a future release.
+select @@global.time_format;
+@@global.time_format
+%H:%i:%s
+Warnings:
+Warning	1287	'@@time_format' is deprecated and will be removed in a future release.
+select @@global.datetime_format;
+@@global.datetime_format
+%Y-%m-%d %H:%i:%s
+Warnings:
+Warning	1287	'@@datetime_format' is deprecated and will be removed in a future release.
+set @@global.max_tmp_tables= 64;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+set @@global.max_tmp_tables= @@global.max_tmp_tables;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+set @@global.max_tmp_tables= @default_max_tmp_tables;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+SHOW PROFILE;
+Status	Duration
+Warnings:
+Warning	1287	'SHOW PROFILE' is deprecated and will be removed in a future release. Please use Performance Schema instead
+SHOW PROFILE ALL;
+Status	Duration	CPU_user	CPU_system	Context_voluntary	Context_involuntary	Block_ops_in	Block_ops_out	Messages_sent	Messages_received	Page_faults_major	Page_faults_minor	Swaps	Source_function	Source_file	Source_line
+Warnings:
+Warning	1287	'SHOW PROFILE' is deprecated and will be removed in a future release. Please use Performance Schema instead
+SHOW PROFILE IPC;
+Status	Duration	Messages_sent	Messages_received
+Warnings:
+Warning	1287	'SHOW PROFILE' is deprecated and will be removed in a future release. Please use Performance Schema instead
+SHOW PROFILES;
+Query_ID	Duration	Query
+Warnings:
+Warning	1287	'SHOW PROFILES' is deprecated and will be removed in a future release. Please use Performance Schema instead
+INSTALL PLUGIN validate_password SONAME 'validate_password.so';
+# restarting the server
+# 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.
+Deprecation warning count : 1

=== modified file 'mysql-test/suite/rpl/r/rpl_spec_variables.result'
--- a/mysql-test/suite/rpl/r/rpl_spec_variables.result	2012-06-01 07:34:26 +0000
+++ b/mysql-test/suite/rpl/r/rpl_spec_variables.result	2012-08-21 08:11:45 +0000
@@ -143,10 +143,10 @@ COUNT(*)<2000 AND COUNT(*)>0
 DROP TABLE IF EXISTS t1,t2;
 
 * storage_engine *
-SET @restore_master_storage_engine=@@global.storage_engine;
+SET @restore_master_storage_engine=@@global.default_storage_engine;
 SET @@global.default_storage_engine=InnoDB;
 SET @@session.default_storage_engine=InnoDB;
-SET @restore_slave_storage_engine=@@global.storage_engine;
+SET @restore_slave_storage_engine=@@global.default_storage_engine;
 SET @@global.default_storage_engine=Memory;
 SET @@session.default_storage_engine=Memory;
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10));

=== modified file 'mysql-test/suite/rpl/t/rpl_spec_variables.test'
--- a/mysql-test/suite/rpl/t/rpl_spec_variables.test	2012-06-01 07:34:26 +0000
+++ b/mysql-test/suite/rpl/t/rpl_spec_variables.test	2012-08-21 08:11:45 +0000
@@ -220,12 +220,12 @@ DROP TABLE IF EXISTS t1,t2;
 --echo * storage_engine *
 
 --connection master
-SET @restore_master_storage_engine=@@global.storage_engine;
+SET @restore_master_storage_engine=@@global.default_storage_engine;
 SET @@global.default_storage_engine=InnoDB;
 SET @@session.default_storage_engine=InnoDB;
 
 --connection slave
-SET @restore_slave_storage_engine=@@global.storage_engine;
+SET @restore_slave_storage_engine=@@global.default_storage_engine;
 SET @@global.default_storage_engine=Memory;
 SET @@session.default_storage_engine=Memory;
 

=== modified file 'mysql-test/suite/sys_vars/r/date_format_basic.result'
--- a/mysql-test/suite/sys_vars/r/date_format_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/date_format_basic.result	2012-08-21 08:11:45 +0000
@@ -1,6 +1,8 @@
 select @@global.date_format;
 @@global.date_format
 %Y-%m-%d
+Warnings:
+Warning	1287	'@@date_format' is deprecated and will be removed in a future release.
 select @@session.date_format;
 ERROR HY000: Variable 'date_format' is a GLOBAL variable
 show global variables like 'date_format';

=== modified file 'mysql-test/suite/sys_vars/r/datetime_format_basic.result'
--- a/mysql-test/suite/sys_vars/r/datetime_format_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/datetime_format_basic.result	2012-08-21 08:11:45 +0000
@@ -1,6 +1,8 @@
 select @@global.datetime_format;
 @@global.datetime_format
 %Y-%m-%d %H:%i:%s
+Warnings:
+Warning	1287	'@@datetime_format' is deprecated and will be removed in a future release.
 select @@session.datetime_format;
 ERROR HY000: Variable 'datetime_format' is a GLOBAL variable
 show global variables like 'datetime_format';

=== modified file 'mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result	2012-08-21 08:11:45 +0000
@@ -1,186 +1,311 @@
 SET @start_global_value = @@global.max_tmp_tables;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @start_global_value;
 @start_global_value
 32
 SET @start_session_value = @@session.max_tmp_tables;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @start_session_value;
 @start_session_value
 32
 '#--------------------FN_DYNVARS_086_01-------------------------#'
 SET @@global.max_tmp_tables = 1000;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 1000;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_086_02-------------------------#'
 SET @@global.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables = 32;
 @@global.max_tmp_tables = 32
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables = 32;
 @@session.max_tmp_tables = 32
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_086_03-------------------------#'
 SET @@global.max_tmp_tables = 1;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 2;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 2
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 65536;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 65536
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 4294967295;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 4294967294;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967294
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_086_04-------------------------#'
 SET @@session.max_tmp_tables = 1;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 2;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 2
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 65536;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 65536
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 4294967295;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 4294967294;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967294
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_05-----------------------#'
 SET @@global.max_tmp_tables = -1024;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1024'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 4294967296;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = -1;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 429496729500;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = test;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 4294967296;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = -1;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 429496729500;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = -001;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SET @@session.max_tmp_tables = 10737418241;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '10737418241'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = test;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_06-----------------------#'
 SELECT @@global.max_tmp_tables = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
 WHERE VARIABLE_NAME='max_tmp_tables';
 @@global.max_tmp_tables = VARIABLE_VALUE
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_07-----------------------#'
 SELECT @@session.max_tmp_tables = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
 WHERE VARIABLE_NAME='max_tmp_tables';
 @@session.max_tmp_tables = VARIABLE_VALUE
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_08-----------------------#'
 SET @@global.max_tmp_tables = TRUE;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = FALSE;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '0'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_086_09----------------------#'
 SET @@global.max_tmp_tables = 20;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables = @@global.max_tmp_tables;
 @@max_tmp_tables = @@global.max_tmp_tables
 0
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_086_10----------------------#'
 SET @@max_tmp_tables = 255;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables = @@local.max_tmp_tables;
 @@max_tmp_tables = @@local.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@local.max_tmp_tables = @@session.max_tmp_tables;
 @@local.max_tmp_tables = @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_086_11----------------------#'
 SET max_tmp_tables = 102;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables;
 @@max_tmp_tables
 102
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT local.max_tmp_tables;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.max_tmp_tables;
@@ -188,10 +313,18 @@ ERROR 42S02: Unknown table 'session' in
 SELECT max_tmp_tables = @@session.max_tmp_tables;
 ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list'
 SET @@global.max_tmp_tables = @start_global_value;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = @start_session_value;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.

=== modified file 'mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result	2012-08-21 08:11:45 +0000
@@ -1,176 +1,306 @@
 SET @start_global_value = @@global.max_tmp_tables;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @start_global_value;
 @start_global_value
 32
 SET @start_session_value = @@session.max_tmp_tables;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @start_session_value;
 @start_session_value
 32
 '#--------------------FN_DYNVARS_086_01-------------------------#'
 SET @@global.max_tmp_tables = 1000;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 1000;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_086_02-------------------------#'
 SET @@global.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables = 32;
 @@global.max_tmp_tables = 32
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables = 32;
 @@session.max_tmp_tables = 32
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_086_03-------------------------#'
 SET @@global.max_tmp_tables = 1;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 2;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 2
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 65536;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 65536
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 4294967295;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 4294967294;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967294
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#--------------------FN_DYNVARS_086_04-------------------------#'
 SET @@session.max_tmp_tables = 1;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 2;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 2
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 65536;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 65536
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 4294967295;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 4294967294;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967294
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_05-----------------------#'
 SET @@global.max_tmp_tables = -1024;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1024'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 4294967296;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967296
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = -1;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 429496729500;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 429496729500
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 429496729500
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = test;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 429496729500
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 4294967296;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967296
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = -1;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 429496729500;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 429496729500
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = -001;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SET @@session.max_tmp_tables = 10737418241;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 10737418241
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = test;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 10737418241
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_06-----------------------#'
 SELECT @@global.max_tmp_tables = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
 WHERE VARIABLE_NAME='max_tmp_tables';
 @@global.max_tmp_tables = VARIABLE_VALUE
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_07-----------------------#'
 SELECT @@session.max_tmp_tables = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
 WHERE VARIABLE_NAME='max_tmp_tables';
 @@session.max_tmp_tables = VARIABLE_VALUE
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#------------------FN_DYNVARS_086_08-----------------------#'
 SET @@global.max_tmp_tables = TRUE;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = FALSE;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '0'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_086_09----------------------#'
 SET @@global.max_tmp_tables = 20;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables = @@global.max_tmp_tables;
 @@max_tmp_tables = @@global.max_tmp_tables
 0
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_086_10----------------------#'
 SET @@max_tmp_tables = 255;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables = @@local.max_tmp_tables;
 @@max_tmp_tables = @@local.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@local.max_tmp_tables = @@session.max_tmp_tables;
 @@local.max_tmp_tables = @@session.max_tmp_tables
 1
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 '#---------------------FN_DYNVARS_086_11----------------------#'
 SET max_tmp_tables = 102;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables;
 @@max_tmp_tables
 102
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT local.max_tmp_tables;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.max_tmp_tables;
@@ -178,10 +308,18 @@ ERROR 42S02: Unknown table 'session' in
 SELECT max_tmp_tables = @@session.max_tmp_tables;
 ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list'
 SET @@global.max_tmp_tables = @start_global_value;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = @start_session_value;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 32
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.

=== modified file 'mysql-test/suite/sys_vars/r/thread_concurrency_basic.result'
--- a/mysql-test/suite/sys_vars/r/thread_concurrency_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/thread_concurrency_basic.result	2012-08-21 08:11:45 +0000
@@ -1,6 +1,8 @@
 select @@global.thread_concurrency;
 @@global.thread_concurrency
 10
+Warnings:
+Warning	1287	'@@thread_concurrency' is deprecated and will be removed in a future release.
 select @@session.thread_concurrency;
 ERROR HY000: Variable 'thread_concurrency' is a GLOBAL variable
 show global variables like 'thread_concurrency';

=== modified file 'mysql-test/suite/sys_vars/r/time_format_basic.result'
--- a/mysql-test/suite/sys_vars/r/time_format_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/time_format_basic.result	2012-08-21 08:11:45 +0000
@@ -1,6 +1,8 @@
 select @@global.time_format;
 @@global.time_format
 %H:%i:%s
+Warnings:
+Warning	1287	'@@time_format' is deprecated and will be removed in a future release.
 select @@session.time_format;
 ERROR HY000: Variable 'time_format' is a GLOBAL variable
 show global variables like 'time_format';

=== modified file 'mysql-test/t/profiling.test'
--- a/mysql-test/t/profiling.test	2009-12-22 09:35:56 +0000
+++ b/mysql-test/t/profiling.test	2012-08-21 08:11:45 +0000
@@ -2,8 +2,10 @@
 
 # Verify that the protocol isn't violated if we ask for profiling info
 # before profiling has recorded anything.
+--disable_warnings
 show profiles;
 show profile all;
+--enable_warnings
 
 # default is OFF
 show session variables like 'profil%';
@@ -57,8 +59,10 @@ select max(x) from (select sum(a) as x f
 select '012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890' as big_string;
 
 --enable_result_log
+--disable_warnings
 --replace_column 2 #
 show profiles;
+--enable_warnings
 
 --disable_result_log
 ###--replace_column 2 # 3 # 4 #
@@ -111,6 +115,7 @@ insert into t1 values (1), (2), (3);
 insert into t2 values (1), (2), (3);
 insert into t3 values (1), (2), (3);
 
+--disable_warnings
 --replace_column 2 #
 show profiles;
 
@@ -132,6 +137,7 @@ set session profiling = OFF;
 select sum(id) from t1;
 --replace_column 2 #
 show profiles;
+--enable_warnings
 
 ##  Verify that the various juggling of THD contexts doesn't affect profiling.
 
@@ -151,7 +157,6 @@ create table profile_log (how_many int);
 drop procedure if exists p1;
 drop procedure if exists p2;
 drop procedure if exists p3;
---enable_warnings
 
 delimiter //;
 create procedure p1 () 
@@ -176,6 +181,7 @@ begin
   show profile; 
 end//
 delimiter ;//
+--enable_warnings
 
 --disable_result_log
 --echo first call to p1

=== added file 'mysql-test/t/wl6443_deprecation-master.opt'
--- a/mysql-test/t/wl6443_deprecation-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/wl6443_deprecation-master.opt	2012-08-21 08:11:45 +0000
@@ -0,0 +1 @@
+$VALIDATE_PASSWORD_OPT

=== added file 'mysql-test/t/wl6443_deprecation.test'
--- a/mysql-test/t/wl6443_deprecation.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/wl6443_deprecation.test	2012-08-21 08:11:45 +0000
@@ -0,0 +1,70 @@
+--source include/not_embedded.inc
+--source include/have_validate_password_plugin.inc
+#
+# Tests for deprecation warnings introduced by wl#6443
+#
+
+# System variables
+
+select @@global.max_tmp_tables;
+select @@local.max_tmp_tables;
+set @default_max_tmp_tables= @@global.max_tmp_tables;
+select @@global.date_format;
+select @@global.time_format;
+select @@global.datetime_format;
+set @@global.max_tmp_tables= 64;
+set @@global.max_tmp_tables= @@global.max_tmp_tables;
+set @@global.max_tmp_tables= @default_max_tmp_tables;
+
+# SHOW PROFILE and SHOW PROFILES
+
+SHOW PROFILE;
+SHOW PROFILE ALL;
+SHOW PROFILE IPC;
+SHOW PROFILES;
+
+# --plugin-xxx
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN validate_password SONAME '$VALIDATE_PASSWORD';
+
+--echo # restarting the server
+
+# Write file to make mysql-test-run.pl wait for the server to stop
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+# Request shutdown
+-- send_shutdown
+
+# Call script that will poll the server waiting for it to disapear
+-- source include/wait_until_disconnected.inc
+
+--echo # Restart server.
+
+--exec echo "restart:--plugin-validate-password-length=8" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+# Turn on reconnect
+--enable_reconnect
+
+# Call script that will poll the server waiting for it to be back online again
+--source include/wait_until_connected_again.inc
+
+# Turn off reconnect again
+--disable_reconnect
+
+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.
+--let $log_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let LOGF= $log_file
+
+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= $count_warnings;
+  print "Deprecation warning count : $count_warnings\n";
+  close(FILE);
+EOF

=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc	2012-08-07 13:37:23 +0000
+++ b/sql/item_func.cc	2012-08-21 08:11:45 +0000
@@ -6456,6 +6456,8 @@ Item *get_system_var(THD *thd, enum_var_
   thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
 
   set_if_smaller(component_name->length, MAX_SYS_VAR_LENGTH);
+  
+  var->do_deprecated_warning(thd);
 
   return new Item_func_get_system_var(var, var_type, component_name,
                                       NULL, 0);

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2012-06-12 13:31:36 +0000
+++ b/sql/set_var.cc	2012-08-21 08:11:45 +0000
@@ -210,7 +210,6 @@ uchar *sys_var::global_value_ptr(THD *th
 
 bool sys_var::check(THD *thd, set_var *var)
 {
-  do_deprecated_warning(thd);
   if ((var->value && do_check(thd, var))
       || (on_check && on_check(this, thd, var)))
   {
@@ -599,6 +598,7 @@ err:
 
 int set_var::check(THD *thd)
 {
+  var->do_deprecated_warning(thd);
   if (var->is_readonly())
   {
     my_error(ER_INCORRECT_GLOBAL_LOCAL_VAR, MYF(0), var->name.str, "read only");

=== modified file 'sql/set_var.h'
--- a/sql/set_var.h	2012-03-06 14:29:42 +0000
+++ b/sql/set_var.h	2012-08-21 08:11:45 +0000
@@ -135,6 +135,7 @@ public:
     return (option.id != -1) && (m_parse_flag & parse_flags) &&
       (array->push_back(option), false);
   }
+  void do_deprecated_warning(THD *thd);
 
 private:
   virtual bool do_check(THD *thd, set_var *var) = 0;
@@ -148,7 +149,6 @@ private:
   virtual void global_save_default(THD *thd, set_var *var) = 0;
   virtual bool session_update(THD *thd, set_var *var) = 0;
   virtual bool global_update(THD *thd, set_var *var) = 0;
-  void do_deprecated_warning(THD *thd);
 protected:
   /**
     A pointer to a value of the variable for SHOW.

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2012-08-02 21:42:11 +0000
+++ b/sql/share/errmsg-utf8.txt	2012-08-21 08:11:45 +0000
@@ -6417,8 +6417,8 @@ ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BI
 ER_PATH_LENGTH
   eng "The path specified for %.64s is too long."
 ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT  
-  eng "The syntax '%s' is deprecated and will be removed in MySQL %s."
-  ger "Die Syntax '%s' ist veraltet und wird in MySQL %s entfernt."
+  eng "'%s' is deprecated and will be removed in a future release."
+  ger "'%s' ist veraltet und wird in einer zukünftigen Version entfernt werden."
 
 ER_WRONG_NATIVE_TABLE_STRUCTURE
         eng "Native table '%-.64s'.'%-.64s' has the wrong structure"

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2012-08-03 17:38:02 +0000
+++ b/sql/sql_plugin.cc	2012-08-21 08:11:45 +0000
@@ -261,6 +261,9 @@ public:
 static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv);
 static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
                              const char *list);
+static my_bool check_if_option_is_deprecated(int optid,
+                                             const struct my_option *opt,
+                                             char *argument);
 static int test_plugin_options(MEM_ROOT *, struct st_plugin_int *,
                                int *, char **);
 static bool register_builtin(struct st_mysql_plugin *, struct st_plugin_int *,
@@ -3307,7 +3310,8 @@ static int construct_options(MEM_ROOT *m
     /* support --skip-plugin-foo syntax */
     options[0].name= plugin_name_ptr;
     options[1].name= plugin_name_with_prefix_ptr;
-    options[0].id= options[1].id= 0;
+    options[0].id= 0;
+    options[1].id= -1;
     options[0].var_type= options[1].var_type= GET_ENUM;
     options[0].arg_type= options[1].arg_type= OPT_ARG;
     options[0].def_value= options[1].def_value= 1; /* ON */
@@ -3494,6 +3498,7 @@ static int construct_options(MEM_ROOT *m
 
     char *option_name_ptr;
     options[1]= options[0];
+    options[1].id= -1;
     options[1].name= option_name_ptr= (char*) alloc_root(mem_root,
                                                         plugin_dash.length +
                                                         optnamelen + 1);
@@ -3537,6 +3542,34 @@ static my_option *construct_help_options
   DBUG_RETURN(opts);
 }
 
+
+/**
+  Check option being used and raise deprecation warning if required.
+
+  @param optid ID of the option that was passed through command line
+  @param opt List of options
+  @argument Status of the option : Enable or Disable
+
+  A deprecation warning will be raised if --plugin-xxx type of option
+  is used.
+
+  @return Always returns success as purpose of the function is to raise
+  warning only.
+  @retval 0 Success
+*/
+
+static my_bool check_if_option_is_deprecated(int optid,
+                                             const struct my_option *opt,
+                                             char *argument __attribute__((unused)))
+{
+  if (optid == -1)
+  {
+    WARN_DEPRECATED(NULL, opt->name, (opt->name + strlen("plugin-")));
+  }
+  return 0;
+}
+
+
 /**
   Create and register system variables supplied from the plugin and
   assigns initial values from corresponding command line arguments.
@@ -3611,7 +3644,7 @@ static int test_plugin_options(MEM_ROOT
         tmp->load_option != PLUGIN_FORCE_PLUS_PERMANENT)
       opts[0].def_value= opts[1].def_value= plugin_load_option;
 
-    error= handle_options(argc, &argv, opts, NULL);
+    error= handle_options(argc, &argv, opts, check_if_option_is_deprecated);
     (*argc)++; /* add back one for the program name */
 
     if (error)

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2012-08-03 11:31:19 +0000
+++ b/sql/sql_yacc.yy	2012-08-21 08:11:45 +0000
@@ -12427,9 +12427,19 @@ show_param:
         | ERRORS opt_limit_clause_init
           { Lex->sql_command = SQLCOM_SHOW_ERRORS;}
         | PROFILES_SYM
-          { Lex->sql_command = SQLCOM_SHOW_PROFILES; }
+          {
+            push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
+                                ER_WARN_DEPRECATED_SYNTAX,
+                                ER(ER_WARN_DEPRECATED_SYNTAX),
+                                "SHOW PROFILES", "Performance Schema");
+            Lex->sql_command = SQLCOM_SHOW_PROFILES;
+          }
         | PROFILE_SYM opt_profile_defs opt_profile_args opt_limit_clause_init
-          { 
+          {
+            push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
+                                ER_WARN_DEPRECATED_SYNTAX,
+                                ER(ER_WARN_DEPRECATED_SYNTAX),
+                                "SHOW PROFILE", "Performance Schema");
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_PROFILE;
             if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0)

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2012-08-03 19:00:50 +0000
+++ b/sql/sys_vars.cc	2012-08-21 08:11:45 +0000
@@ -1854,7 +1854,8 @@ static Sys_var_ulong Sys_max_tmp_tables(
        "max_tmp_tables",
        "Maximum number of temporary tables a client can keep open at a time",
        SESSION_VAR(max_tmp_tables), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, ULONG_MAX), DEFAULT(32), BLOCK_SIZE(1));
+       VALID_RANGE(1, ULONG_MAX), DEFAULT(32), BLOCK_SIZE(1), NO_MUTEX_GUARD,
+       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
 
 static Sys_var_ulong Sys_max_write_lock_count(
        "max_write_lock_count",
@@ -3066,19 +3067,25 @@ static Sys_var_charptr Sys_date_format(
        "date_format", "The DATE format (ignored)",
        READ_ONLY GLOBAL_VAR(global_date_format.format.str),
        CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
-       DEFAULT(known_date_time_formats[ISO_FORMAT].date_format));
+       DEFAULT(known_date_time_formats[ISO_FORMAT].date_format),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED(""));
 
 static Sys_var_charptr Sys_datetime_format(
        "datetime_format", "The DATETIME format (ignored)",
        READ_ONLY GLOBAL_VAR(global_datetime_format.format.str),
        CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
-       DEFAULT(known_date_time_formats[ISO_FORMAT].datetime_format));
+       DEFAULT(known_date_time_formats[ISO_FORMAT].datetime_format),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED(""));
 
 static Sys_var_charptr Sys_time_format(
        "time_format", "The TIME format (ignored)",
        READ_ONLY GLOBAL_VAR(global_time_format.format.str),
        CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
-       DEFAULT(known_date_time_formats[ISO_FORMAT].time_format));
+       DEFAULT(known_date_time_formats[ISO_FORMAT].time_format),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED(""));
 
 static bool fix_autocommit(sys_var *self, THD *thd, enum_var_type type)
 {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (harin.vadodaria:4202 to 4203) WL#6443Harin Vadodaria21 Aug