From: Martin Hansson Date: June 19 2012 10:47am Subject: bzr push into mysql-trunk branch (martin.hansson:4033 to 4035) List-Archive: http://lists.mysql.com/commits/144265 Message-Id: <201206191047.q5JAlSe5023353@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4035 Martin Hansson 2012-06-19 Fixed for windows modified: mysql-test/r/mysqld--help-win.result 4034 Martin Hansson 2012-06-19 Fixed for 64 bit. modified: mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result 4033 Martin Hansson 2012-06-18 Bug#13985071: DEPRECATE INSERT DELAYED Follow-up patch. There is now a deprecation message when using system variables that are part of the INSERT DELAYED feature. The variables are also flagged as deprecated when running mysqld --help. modified: mysql-test/r/delayed.result mysql-test/r/mysqld--help-notwin.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_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/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 === modified file 'mysql-test/r/mysqld--help-win.result' --- a/mysql-test/r/mysqld--help-win.result 2012-06-12 13:31:36 +0000 +++ b/mysql-test/r/mysqld--help-win.result 2012-06-19 10:46:21 +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 @@ -368,7 +371,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/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-06-19 11:37:59 +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_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-06-19 11:37:59 +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 No bundle (reason: useless for push emails).