List:Commits« Previous MessageNext Message »
From:Martin Hansson Date:August 27 2012 2:02pm
Subject:bzr push into mysql-5.6 branch (martin.hansson:4189 to 4190) Bug#13985071
View as plain text  
 4190 Martin Hansson	2012-08-27
      Bug#13985071: Back-port of the patch deprecating delayed insert system variables.

    modified:
      mysql-test/r/delayed.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/variables.result
      mysql-test/suite/rpl/r/rpl_bug31076.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
      mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
      mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
      mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
      mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
      mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
      mysql-test/t/delayed.test
      sql/sys_vars.cc
 4189 Nirbhay Choubey	2012-08-27
      Bug#13598383 MAIN.MYSQLDUMP TEST FAILS ON RHEL 32 BIT
      
      Comments in mysqldump's output were not getting
      printed in right order. This happened as data from
      stdout (buffered) and stderr (unbuffered) were being
      displayed together.
      
      Fixed the test by redirecting the stderr output
      of the command to a separate file.
      
      Its a modification in the existing test. No separate
      test provided.

    modified:
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
=== modified file 'mysql-test/r/delayed.result'
--- a/mysql-test/r/delayed.result	2012-05-18 11:06:00 +0000
+++ b/mysql-test/r/delayed.result	2012-08-27 13:59:12 +0000
@@ -549,3 +549,21 @@ CREATE TEMPORARY TABLE t1(a int);
 INSERT DELAYED t1 VALUES (1);
 ERROR 42S02: Table 'test.t1' doesn't exist
 DROP TEMPORARY TABLE t1;
+#
+# Bug#13985071: DEPRECATE INSERT DELAYED
+#
+SET GLOBAL delayed_insert_limit = 100;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
+SET GLOBAL delayed_insert_timeout = 300;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
+SET GLOBAL delayed_queue_size = 1000;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
+SET GLOBAL max_delayed_threads = 20;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
+SET GLOBAL max_insert_delayed_threads = 20;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.

=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2012-07-10 11:59:40 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2012-08-27 13:59:12 +0000
@@ -153,15 +153,18 @@ The following options may be given as th
  After inserting delayed_insert_limit rows, the INSERT
  DELAYED handler will check if there are any SELECT
  statements pending. If so, it allows these to execute
- before continuing
+ before continuing. This variable is deprecated along with
+ INSERT DELAYED.
  --delayed-insert-timeout=# 
  How long a INSERT DELAYED thread should wait for INSERT
- statements before terminating
+ statements before terminating.This variable is deprecated
+ along with INSERT DELAYED.
  --delayed-queue-size=# 
  What size queue (in rows) should be allocated for
  handling INSERT DELAYED. If the queue becomes full, any
  client that does INSERT DELAYED will wait until there is
- room in the queue again
+ room in the queue again.This variable is deprecated along
+ with INSERT DELAYED.
  --disable-gtid-unsafe-statements 
  Prevents execution of statements that would be impossible
  to log in a transactionally safe manner. Currently, the
@@ -374,7 +377,8 @@ The following options may be given as th
  --max-delayed-threads=# 
  Don't start more than this number of threads to handle
  INSERT DELAYED statements. If set to zero INSERT DELAYED
- will be not used
+ will be not used.This variable is deprecated along with
+ INSERT DELAYED.
  --max-error-count=# Max number of errors/warnings to store for a statement
  --max-heap-table-size=# 
  Don't allow creation of heap tables bigger than this

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-07-10 11:59:40 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-08-27 13:59:12 +0000
@@ -153,15 +153,18 @@ The following options may be given as th
  After inserting delayed_insert_limit rows, the INSERT
  DELAYED handler will check if there are any SELECT
  statements pending. If so, it allows these to execute
- before continuing
+ before continuing. This variable is deprecated along with
+ INSERT DELAYED.
  --delayed-insert-timeout=# 
  How long a INSERT DELAYED thread should wait for INSERT
- statements before terminating
+ statements before terminating.This variable is deprecated
+ along with INSERT DELAYED.
  --delayed-queue-size=# 
  What size queue (in rows) should be allocated for
  handling INSERT DELAYED. If the queue becomes full, any
  client that does INSERT DELAYED will wait until there is
- room in the queue again
+ room in the queue again.This variable is deprecated along
+ with INSERT DELAYED.
  --disable-gtid-unsafe-statements 
  Prevents execution of statements that would be impossible
  to log in a transactionally safe manner. Currently, the
@@ -373,7 +376,8 @@ The following options may be given as th
  --max-delayed-threads=# 
  Don't start more than this number of threads to handle
  INSERT DELAYED statements. If set to zero INSERT DELAYED
- will be not used
+ will be not used.This variable is deprecated along with
+ INSERT DELAYED.
  --max-error-count=# Max number of errors/warnings to store for a statement
  --max-heap-table-size=# 
  Don't allow creation of heap tables bigger than this

=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2012-08-24 08:38:58 +0000
+++ b/mysql-test/r/variables.result	2012-08-27 13:59:12 +0000
@@ -481,8 +481,14 @@ select @@delay_key_write;
 @@delay_key_write
 ON
 set global delayed_insert_limit=100;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 set global delayed_insert_timeout=100;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 set global delayed_queue_size=100;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 set global flush=1;
 set global flush_time=100;
 set insert_id=1;
@@ -514,6 +520,8 @@ Warning	1292	Truncated incorrect max_bin
 set global max_connect_errors=100;
 set global max_connections=100;
 set global max_delayed_threads=100;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 set max_heap_table_size=100;
 Warnings:
 Warning	1292	Truncated incorrect max_heap_table_size value: '100'
@@ -1037,7 +1045,11 @@ set @save_join_buffer_size=@@join_buffer
 set join_buffer_size=@save_join_buffer_size;
 set global connect_timeout           =@my_connect_timeout;
 set global delayed_insert_timeout    =@my_delayed_insert_timeout;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 set global delayed_queue_size        =@my_delayed_queue_size;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 set global flush                     =@my_flush;
 set global flush_time                =@my_flush_time;
 set global key_buffer_size           =@my_key_buffer_size;
@@ -1047,8 +1059,12 @@ set global max_binlog_size           =@m
 set global max_connect_errors        =@my_max_connect_errors;
 set global max_connections           =@my_max_connections;
 set global max_delayed_threads       =@my_max_delayed_threads;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 set global max_heap_table_size       =@my_max_heap_table_size;
 set global max_insert_delayed_threads=@my_max_insert_delayed_threads;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 set global max_join_size             =@my_max_join_size;
 set global max_user_connections      =default;
 set global max_write_lock_count      =default;

=== modified file 'mysql-test/suite/rpl/r/rpl_bug31076.result'
--- a/mysql-test/suite/rpl/r/rpl_bug31076.result	2012-03-23 20:11:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug31076.result	2012-08-27 13:59:12 +0000
@@ -39,6 +39,8 @@ KEY `visit_id` (`visit_id`),
 KEY `data` (`data`)
 ) ENGINE=MyISAM AUTO_INCREMENT=33900731 DEFAULT CHARSET=latin1;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 BINLOG '
 O1ZVRw8BAAAAZgAAAGoAAAAAAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA

=== modified file 'mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result	2012-08-27 13:59:12 +0000
@@ -4,43 +4,58 @@ SELECT @start_value;
 100
 '#--------------------FN_DYNVARS_024_01------------------------#'
 SET @@global.delayed_insert_limit = 100;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SET @@global.delayed_insert_limit = DEFAULT;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 100
 '#---------------------FN_DYNVARS_024_02-------------------------#'
 SET @@global.delayed_insert_limit = @start_value;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_limit = 100;
 @@global.delayed_insert_limit = 100
 1
 '#--------------------FN_DYNVARS_024_03------------------------#'
 SET @@global.delayed_insert_limit = 10000;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 10000
 SET @@global.delayed_insert_limit = 4294967295;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 4294967295
 SET @@global.delayed_insert_limit = 1;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 '#--------------------FN_DYNVARS_024_04-------------------------#'
 SET @@global.delayed_insert_limit = 0;
 Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 SET @@global.delayed_insert_limit = -1024;
 Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_limit value: '-1024'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 SET @@global.delayed_insert_limit = 42949672950;
 Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_limit value: '42949672950'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
@@ -75,17 +90,22 @@ VARIABLE_VALUE
 1
 '#---------------------FN_DYNVARS_024_07----------------------#'
 SET @@global.delayed_insert_limit = TRUE;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 SET @@global.delayed_insert_limit = FALSE;
 Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 '#---------------------FN_DYNVARS_024_08----------------------#'
 SET @@global.delayed_insert_limit = 1;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@delayed_insert_limit = @@global.delayed_insert_limit;
 @@delayed_insert_limit = @@global.delayed_insert_limit
 1
@@ -106,6 +126,8 @@ ERROR 42S02: Unknown table 'global' in f
 SELECT delayed_insert_limit = @@session.delayed_insert_limit;
 ERROR 42S22: Unknown column 'delayed_insert_limit' in 'field list'
 SET @@global.delayed_insert_limit = @start_value;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 100

=== modified file 'mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result	2012-08-27 13:59:12 +0000
@@ -4,42 +4,58 @@ SELECT @start_value;
 100
 '#--------------------FN_DYNVARS_024_01------------------------#'
 SET @@global.delayed_insert_limit = 100;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SET @@global.delayed_insert_limit = DEFAULT;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 100
 '#---------------------FN_DYNVARS_024_02-------------------------#'
 SET @@global.delayed_insert_limit = @start_value;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit = 100;
 @@global.delayed_insert_limit = 100
 1
 '#--------------------FN_DYNVARS_024_03------------------------#'
 SET @@global.delayed_insert_limit = 10000;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 10000
 SET @@global.delayed_insert_limit = 4294967295;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 4294967295
 SET @@global.delayed_insert_limit = 1;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 '#--------------------FN_DYNVARS_024_04-------------------------#'
 SET @@global.delayed_insert_limit = 0;
 Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 SET @@global.delayed_insert_limit = -1024;
 Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 Warning	1292	Truncated incorrect delayed_insert_limit value: '-1024'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 SET @@global.delayed_insert_limit = 42949672950;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 42949672950
@@ -73,17 +89,22 @@ VARIABLE_VALUE
 1
 '#---------------------FN_DYNVARS_024_07----------------------#'
 SET @@global.delayed_insert_limit = TRUE;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 SET @@global.delayed_insert_limit = FALSE;
 Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 1
 '#---------------------FN_DYNVARS_024_08----------------------#'
 SET @@global.delayed_insert_limit = 1;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@delayed_insert_limit = @@global.delayed_insert_limit;
 @@delayed_insert_limit = @@global.delayed_insert_limit
 1
@@ -104,6 +125,8 @@ ERROR 42S02: Unknown table 'global' in f
 SELECT delayed_insert_limit = @@session.delayed_insert_limit;
 ERROR 42S22: Unknown column 'delayed_insert_limit' in 'field list'
 SET @@global.delayed_insert_limit = @start_value;
+Warnings:
+Warning	1287	The syntax '@@delayed_insert_limit' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 100

=== modified file 'mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result'
--- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result	2012-05-18 11:06:00 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result	2012-08-27 13:59:12 +0000
@@ -7,6 +7,8 @@ CREATE TABLE t1 (a VARCHAR(100),b VARCHA
 CREATE VIEW v1 as select * from t1;
 '#--------------------FN_DYNVARS_25_01-------------------------#'
 SET GLOBAL delayed_insert_limit = 14;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 INSERT INTO t1 VALUES('1','1','1');
 INSERT INTO t1 VALUES('2','1','1');
 INSERT INTO t1 VALUES('3','1','1');
@@ -78,6 +80,8 @@ DROP VIEW v1;
 CREATE TABLE t1 (a VARCHAR(100));
 CREATE VIEW v1 AS SELECT * FROM t1;
 SET GLOBAL delayed_insert_limit = 20;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 INSERT INTO t1 VALUES('1');
 INSERT INTO t1 VALUES('2');
 INSERT INTO t1 VALUES('3');
@@ -125,4 +129,6 @@ COUNT(*) BETWEEN 6 AND 22
 DROP TABLE t1;
 DROP VIEW v1;
 SET @@GLOBAL.delayed_insert_limit = @global_delayed_insert_limit;
+Warnings:
+Warning	1287	'@@delayed_insert_limit' is deprecated and will be removed in a future release.
 Disconnecting from con1, con0

=== modified file 'mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result'
--- a/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result	2012-08-27 13:59:12 +0000
@@ -4,43 +4,58 @@ SELECT @start_value;
 300
 '#--------------------FN_DYNVARS_025_01------------------------#'
 SET @@global.delayed_insert_timeout = 100;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SET @@global.delayed_insert_timeout = DEFAULT;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 300
 '#---------------------FN_DYNVARS_025_02-------------------------#'
 SET @@global.delayed_insert_timeout = @start_value;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout = 300;
 @@global.delayed_insert_timeout = 300
 1
 '#--------------------FN_DYNVARS_025_03------------------------#'
 SET @@global.delayed_insert_timeout = 10000;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 10000
 SET @@global.delayed_insert_timeout = 429;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 429
 SET @@global.delayed_insert_timeout = 1;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 1
 '#--------------------FN_DYNVARS_025_04-------------------------#'
 SET @@global.delayed_insert_timeout = 0;
 Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_timeout value: '0'
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 1
 SET @@global.delayed_insert_timeout = -1024;
 Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_timeout value: '-1024'
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 1
 SET @@global.delayed_insert_timeout = 42949672950;
 Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_timeout value: '42949672950'
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
@@ -73,17 +88,22 @@ WHERE VARIABLE_NAME='delayed_insert_time
 1
 '#---------------------FN_DYNVARS_025_07----------------------#'
 SET @@global.delayed_insert_timeout = TRUE;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 1
 SET @@global.delayed_insert_timeout = FALSE;
 Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_insert_timeout value: '0'
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 1
 '#---------------------FN_DYNVARS_025_08----------------------#'
 SET @@global.delayed_insert_timeout = 1;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@delayed_insert_timeout = @@global.delayed_insert_timeout;
 @@delayed_insert_timeout = @@global.delayed_insert_timeout
 1
@@ -104,10 +124,14 @@ ERROR 42S02: Unknown table 'global' in f
 SELECT delayed_insert_timeout = @@session.delayed_insert_timeout;
 ERROR 42S22: Unknown column 'delayed_insert_timeout' in 'field list'
 SET @@global.delayed_insert_timeout = @start_value;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 300
 SET @@global.delayed_insert_timeout = @start_value;
+Warnings:
+Warning	1287	'@@delayed_insert_timeout' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 300

=== modified file 'mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result	2012-08-27 13:59:12 +0000
@@ -4,43 +4,58 @@ SELECT @start_value;
 1000
 '#--------------------FN_DYNVARS_026_01------------------------#'
 SET @@global.delayed_queue_size = 100;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SET @@global.delayed_queue_size = DEFAULT;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1000
 '#---------------------FN_DYNVARS_026_02-------------------------#'
 SET @@global.delayed_queue_size = @start_value;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_queue_size = 1000;
 @@global.delayed_queue_size = 1000
 1
 '#--------------------FN_DYNVARS_026_03------------------------#'
 SET @@global.delayed_queue_size = 10000;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 10000
 SET @@global.delayed_queue_size = 4294967295;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 4294967295
 SET @@global.delayed_queue_size = 1;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 '#--------------------FN_DYNVARS_026_04-------------------------#'
 SET @@global.delayed_queue_size = 0;
 Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_queue_size value: '0'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 SET @@global.delayed_queue_size = -1024;
 Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_queue_size value: '-1024'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 SET @@global.delayed_queue_size = 42949672950;
 Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_queue_size value: '42949672950'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
@@ -73,17 +88,22 @@ WHERE VARIABLE_NAME='delayed_queue_size'
 1
 '#---------------------FN_DYNVARS_026_07----------------------#'
 SET @@global.delayed_queue_size = TRUE;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 SET @@global.delayed_queue_size = FALSE;
 Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect delayed_queue_size value: '0'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 '#---------------------FN_DYNVARS_026_08----------------------#'
 SET @@global.delayed_queue_size = 1;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@delayed_queue_size = @@global.delayed_queue_size;
 @@delayed_queue_size = @@global.delayed_queue_size
 1
@@ -104,6 +124,8 @@ ERROR 42S02: Unknown table 'global' in f
 SELECT delayed_queue_size = @@session.delayed_queue_size;
 ERROR 42S22: Unknown column 'delayed_queue_size' in 'field list'
 SET @@global.delayed_queue_size = @start_value;
+Warnings:
+Warning	1287	'@@delayed_queue_size' is deprecated and will be removed in a future release.
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1000

=== modified file 'mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result	2012-08-27 13:59:12 +0000
@@ -4,42 +4,58 @@ SELECT @start_value;
 1000
 '#--------------------FN_DYNVARS_026_01------------------------#'
 SET @@global.delayed_queue_size = 100;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SET @@global.delayed_queue_size = DEFAULT;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1000
 '#---------------------FN_DYNVARS_026_02-------------------------#'
 SET @@global.delayed_queue_size = @start_value;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size = 1000;
 @@global.delayed_queue_size = 1000
 1
 '#--------------------FN_DYNVARS_026_03------------------------#'
 SET @@global.delayed_queue_size = 10000;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 10000
 SET @@global.delayed_queue_size = 4294967295;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 4294967295
 SET @@global.delayed_queue_size = 1;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 '#--------------------FN_DYNVARS_026_04-------------------------#'
 SET @@global.delayed_queue_size = 0;
 Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 Warning	1292	Truncated incorrect delayed_queue_size value: '0'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 SET @@global.delayed_queue_size = -1024;
 Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 Warning	1292	Truncated incorrect delayed_queue_size value: '-1024'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 SET @@global.delayed_queue_size = 42949672950;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 42949672950
@@ -71,17 +87,22 @@ WHERE VARIABLE_NAME='delayed_queue_size'
 1
 '#---------------------FN_DYNVARS_026_07----------------------#'
 SET @@global.delayed_queue_size = TRUE;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 SET @@global.delayed_queue_size = FALSE;
 Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 Warning	1292	Truncated incorrect delayed_queue_size value: '0'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1
 '#---------------------FN_DYNVARS_026_08----------------------#'
 SET @@global.delayed_queue_size = 1;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@delayed_queue_size = @@global.delayed_queue_size;
 @@delayed_queue_size = @@global.delayed_queue_size
 1
@@ -102,6 +123,8 @@ ERROR 42S02: Unknown table 'global' in f
 SELECT delayed_queue_size = @@session.delayed_queue_size;
 ERROR 42S22: Unknown column 'delayed_queue_size' in 'field list'
 SET @@global.delayed_queue_size = @start_value;
+Warnings:
+Warning	1287	The syntax '@@delayed_queue_size' is deprecated and will be removed in MySQL .
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 1000

=== modified file 'mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result'
--- a/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result	2012-08-27 13:59:12 +0000
@@ -8,43 +8,63 @@ SELECT @start_session_value;
 20
 '#--------------------FN_DYNVARS_075_01-------------------------#'
 SET @@global.max_delayed_threads = 1000;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SET @@global.max_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 20
 SET @@session.max_delayed_threads = 1000;
 ERROR 42000: Variable 'max_delayed_threads' can't be set to the value of '1000'
 SET @@session.max_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 20
 '#--------------------FN_DYNVARS_075_02-------------------------#'
 SET @@global.max_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads = 20;
 @@global.max_delayed_threads = 20
 1
 SET @@session.max_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_delayed_threads = 20;
 @@session.max_delayed_threads = 20
 1
 '#--------------------FN_DYNVARS_075_03-------------------------#'
 SET @@global.max_delayed_threads = 1;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 1
 SET @@global.max_delayed_threads = 1025;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 1025
 SET @@global.max_delayed_threads = 0;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 0
 SET @@global.max_delayed_threads = 16384;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 16384
 SET @@global.max_delayed_threads = 16383;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 16383
@@ -60,6 +80,8 @@ SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 20
 SET @@session.max_delayed_threads = 0;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 0
@@ -69,24 +91,29 @@ SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 0
 SET @@session.max_delayed_threads = 16383;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 16383
 '#------------------FN_DYNVARS_075_05-----------------------#'
 SET @@global.max_delayed_threads = -1024;
 Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_delayed_threads value: '-1024'
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 0
 SET @@global.max_delayed_threads = -1;
 Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_delayed_threads value: '-1'
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 0
 SET @@global.max_delayed_threads = 16385;
 Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_delayed_threads value: '16385'
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
@@ -103,18 +130,21 @@ SELECT @@global.max_delayed_threads;
 16384
 SET @@session.max_delayed_threads = 16385;
 Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_delayed_threads value: '16385'
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 16384
 SET @@session.max_delayed_threads = -1;
 Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_delayed_threads value: '-1'
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 0
 SET @@session.max_delayed_threads = -2;
 Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_delayed_threads value: '-2'
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
@@ -123,6 +153,7 @@ SET @@session.max_delayed_threads = 6553
 ERROR 42000: Incorrect argument type to variable 'max_delayed_threads'
 SET @@session.max_delayed_threads = 10737418241;
 Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_delayed_threads value: '10737418241'
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
@@ -146,15 +177,21 @@ WHERE VARIABLE_NAME='max_delayed_threads
 1
 '#------------------FN_DYNVARS_075_08-----------------------#'
 SET @@global.max_delayed_threads = TRUE;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 1
 SET @@global.max_delayed_threads = FALSE;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 0
 '#---------------------FN_DYNVARS_001_09----------------------#'
 SET @@global.max_delayed_threads = 2048;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@max_delayed_threads = @@global.max_delayed_threads;
 @@max_delayed_threads = @@global.max_delayed_threads
 0
@@ -180,10 +217,14 @@ ERROR 42S02: Unknown table 'session' in
 SELECT max_delayed_threads = @@session.max_delayed_threads;
 ERROR 42S22: Unknown column 'max_delayed_threads' in 'field list'
 SET @@global.max_delayed_threads = @start_global_value;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
 20
 SET @@session.max_delayed_threads = @start_session_value;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_delayed_threads;
 @@session.max_delayed_threads
 20

=== modified file 'mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result'
--- a/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result	2012-08-27 13:59:12 +0000
@@ -8,43 +8,63 @@ SELECT @start_session_value;
 20
 '#--------------------FN_DYNVARS_075_01-------------------------#'
 SET @@global.max_insert_delayed_threads = 1000;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SET @@global.max_insert_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 20
 SET @@session.max_insert_delayed_threads = 1000;
 ERROR 42000: Variable 'max_insert_delayed_threads' can't be set to the value of '1000'
 SET @@session.max_insert_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
 20
 '#--------------------FN_DYNVARS_075_02-------------------------#'
 SET @@global.max_insert_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads = 20;
 @@global.max_insert_delayed_threads = 20
 1
 SET @@session.max_insert_delayed_threads = DEFAULT;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_insert_delayed_threads = 20;
 @@session.max_insert_delayed_threads = 20
 1
 '#--------------------FN_DYNVARS_075_03-------------------------#'
 SET @@global.max_insert_delayed_threads = 1;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 1
 SET @@global.max_insert_delayed_threads = 1025;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 1025
 SET @@global.max_insert_delayed_threads = 0;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 0
 SET @@global.max_insert_delayed_threads = 16384;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 16384
 SET @@global.max_insert_delayed_threads = 16383;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 16383
@@ -60,6 +80,8 @@ SELECT @@session.max_insert_delayed_thre
 @@session.max_insert_delayed_threads
 20
 SET @@session.max_insert_delayed_threads = 0;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
 0
@@ -69,24 +91,29 @@ SELECT @@session.max_insert_delayed_thre
 @@session.max_insert_delayed_threads
 0
 SET @@session.max_insert_delayed_threads = 16383;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
 16383
 '#------------------FN_DYNVARS_075_05-----------------------#'
 SET @@global.max_insert_delayed_threads = -1024;
 Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-1024'
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 0
 SET @@global.max_insert_delayed_threads = -1;
 Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-1'
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 0
 SET @@global.max_insert_delayed_threads = 16385;
 Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_insert_delayed_threads value: '16385'
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
@@ -103,18 +130,21 @@ SELECT @@global.max_insert_delayed_threa
 16384
 SET @@session.max_insert_delayed_threads = 16385;
 Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_insert_delayed_threads value: '16385'
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
 16384
 SET @@session.max_insert_delayed_threads = -1;
 Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-1'
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
 0
 SET @@session.max_insert_delayed_threads = -2;
 Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-2'
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
@@ -123,6 +153,7 @@ SET @@session.max_insert_delayed_threads
 ERROR 42000: Incorrect argument type to variable 'max_insert_delayed_threads'
 SET @@session.max_insert_delayed_threads = 10737418241;
 Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_insert_delayed_threads value: '10737418241'
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
@@ -146,15 +177,21 @@ WHERE VARIABLE_NAME='max_insert_delayed_
 1
 '#------------------FN_DYNVARS_075_08-----------------------#'
 SET @@global.max_insert_delayed_threads = TRUE;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 1
 SET @@global.max_insert_delayed_threads = FALSE;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 0
 '#---------------------FN_DYNVARS_001_09----------------------#'
 SET @@global.max_insert_delayed_threads = 2048;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@max_insert_delayed_threads = @@global.max_insert_delayed_threads;
 @@max_insert_delayed_threads = @@global.max_insert_delayed_threads
 0
@@ -180,10 +217,14 @@ ERROR 42S02: Unknown table 'session' in
 SELECT max_insert_delayed_threads = @@session.max_insert_delayed_threads;
 ERROR 42S22: Unknown column 'max_insert_delayed_threads' in 'field list'
 SET @@global.max_insert_delayed_threads = @start_global_value;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
 20
 SET @@session.max_insert_delayed_threads = @start_session_value;
+Warnings:
+Warning	1287	'@@max_insert_delayed_threads' is deprecated and will be removed in a future release.
 SELECT @@session.max_insert_delayed_threads;
 @@session.max_insert_delayed_threads
 20

=== modified file 'mysql-test/t/delayed.test'
--- a/mysql-test/t/delayed.test	2011-12-09 08:45:15 +0000
+++ b/mysql-test/t/delayed.test	2012-08-27 13:59:12 +0000
@@ -633,3 +633,12 @@ INSERT DELAYED t1 VALUES (1);
 
 DROP TEMPORARY TABLE t1;
 
+--echo #
+--echo # Bug#13985071: DEPRECATE INSERT DELAYED
+--echo #
+
+SET GLOBAL delayed_insert_limit = 100;
+SET GLOBAL delayed_insert_timeout = 300;
+SET GLOBAL delayed_queue_size = 1000;
+SET GLOBAL max_delayed_threads = 20;
+SET GLOBAL max_insert_delayed_threads = 20;

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2012-08-24 08:38:58 +0000
+++ b/sql/sys_vars.cc	2012-08-27 13:59:12 +0000
@@ -1181,25 +1181,33 @@ static Sys_var_ulong Sys_delayed_insert_
        "delayed_insert_limit",
        "After inserting delayed_insert_limit rows, the INSERT DELAYED "
        "handler will check if there are any SELECT statements pending. "
-       "If so, it allows these to execute before continuing",
+       "If so, it allows these to execute before continuing. "
+       "This variable is deprecated along with INSERT DELAYED.",
        GLOBAL_VAR(delayed_insert_limit), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1));
+       VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED(""));
 
 static Sys_var_ulong Sys_delayed_insert_timeout(
        "delayed_insert_timeout",
        "How long a INSERT DELAYED thread should wait for INSERT statements "
-       "before terminating",
+       "before terminating."
+       "This variable is deprecated along with INSERT DELAYED.",
        GLOBAL_VAR(delayed_insert_timeout), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(DELAYED_WAIT_TIMEOUT),
-       BLOCK_SIZE(1));
+       BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+       ON_UPDATE(0), DEPRECATED(""));
 
 static Sys_var_ulong Sys_delayed_queue_size(
        "delayed_queue_size",
        "What size queue (in rows) should be allocated for handling INSERT "
        "DELAYED. If the queue becomes full, any client that does INSERT "
-       "DELAYED will wait until there is room in the queue again",
+       "DELAYED will wait until there is room in the queue again."
+       "This variable is deprecated along with INSERT DELAYED.",
        GLOBAL_VAR(delayed_queue_size), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1));
+       VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED(""));
 
 #ifdef HAVE_EVENT_SCHEDULER
 static const char *event_scheduler_names[]= { "OFF", "ON", "DISABLED", NullS };
@@ -1724,20 +1732,24 @@ static bool check_max_delayed_threads(sy
 static Sys_var_ulong Sys_max_insert_delayed_threads(
        "max_insert_delayed_threads",
        "Don't start more than this number of threads to handle INSERT "
-       "DELAYED statements. If set to zero INSERT DELAYED will be not used",
+       "DELAYED statements. If set to zero INSERT DELAYED will be not used."
+       "This variable is deprecated along with INSERT DELAYED.",
        SESSION_VAR(max_insert_delayed_threads),
        NO_CMD_LINE, VALID_RANGE(0, 16384), DEFAULT(20),
        BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(check_max_delayed_threads), ON_UPDATE(fix_max_connections));
+       ON_CHECK(check_max_delayed_threads), ON_UPDATE(fix_max_connections),
+       DEPRECATED(""));
 
 static Sys_var_ulong Sys_max_delayed_threads(
        "max_delayed_threads",
        "Don't start more than this number of threads to handle INSERT "
-       "DELAYED statements. If set to zero INSERT DELAYED will be not used",
+       "DELAYED statements. If set to zero INSERT DELAYED will be not used."
+       "This variable is deprecated along with INSERT DELAYED.",
        SESSION_VAR(max_insert_delayed_threads),
        CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 16384), DEFAULT(20),
        BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(check_max_delayed_threads), ON_UPDATE(fix_max_connections));
+       ON_CHECK(check_max_delayed_threads), ON_UPDATE(fix_max_connections),
+       DEPRECATED(""));
 
 static Sys_var_ulong Sys_max_error_count(
        "max_error_count",

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (martin.hansson:4189 to 4190) Bug#13985071Martin Hansson27 Aug