diff options
author | Martin Hansson <martin.hansson@oracle.com> | 2012-08-24 10:17:08 +0200 |
---|---|---|
committer | Martin Hansson <martin.hansson@oracle.com> | 2012-08-24 10:17:08 +0200 |
commit | df2bdd6063e1a9a05be0048a309288dc4d7a8ce4 (patch) | |
tree | f1359d24de152fb5cf9bff589dee79d0124ab9f3 /mysql-test/r/variables.result | |
parent | 17695cb4ffcddb9634a9e27c459eab943ceae36e (diff) | |
download | mariadb-git-df2bdd6063e1a9a05be0048a309288dc4d7a8ce4.tar.gz |
Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSION
NUMBERS
If a system variable was declared as deprecated without mention of an
alternative, the message would look funny, e.g. for @@delayed_insert_limit:
Warning 1287 '@@delayed_insert_limit' is deprecated and
will be removed in MySQL .
The message was meant to display the version number, but it's not
possible to give one when declaring a system variable.
The fix does two things:
1) The definition of the message
ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT is changed so that it does
not display a version number. I.e. in English the message now reads:
Warning 1287 The syntax '@@delayed_insert_limit' is deprecated and
will be removed in a future version.
2) The message ER_WARN_DEPRECATED_SYNTAX_WITH_VER is discontinued in
favor of ER_WARN_DEPRECATED_SYNTAX for system variables. This change
was already done in versions 5.6 and above as part of wl#5265. This
part is simply back-ported from the worklog.
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r-- | mysql-test/r/variables.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 2b71117f789..802476b3f76 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -545,7 +545,7 @@ Warning 1292 Truncated incorrect read_buffer_size value: '100' set read_rnd_buffer_size=100; set global rpl_recovery_rank=100; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 '@@rpl_recovery_rank' is deprecated and will be removed in a future release. set global server_id=100; set global slow_launch_time=100; set sort_buffer_size=100; @@ -1068,7 +1068,7 @@ set global query_cache_limit =@my_query_cache_limit; set global query_cache_type =@my_query_cache_type; set global rpl_recovery_rank =@my_rpl_recovery_rank; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 '@@rpl_recovery_rank' is deprecated and will be removed in a future release. set global server_id =@my_server_id; set global slow_launch_time =@my_slow_launch_time; set global default_storage_engine =@my_storage_engine; |