From df4bfefbb8f670a986cd9ebe376fe09248dba4a2 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 10 Sep 2023 20:10:53 +0200 Subject: [PATCH] compile-time deprecation reminders remove old deprecation helpers that were not used anywhere. create new deprecation helpers and enforce their usage this also removes inconsistencies in reporting deprecation: sometimes it was ER_WARN_DEPRECATED_SYNTAX (1287), sometimes ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT (1681), sometimes a warning, sometimes a note. it should always be * ER_WARN_DEPRECATED_SYNTAX * a warning (because it's something actionable, not purely informational) --- mysql-test/main/ctype_binary.result | 4 +- mysql-test/main/ctype_cp1251.result | 4 +- mysql-test/main/ctype_latin1.result | 4 +- mysql-test/main/ctype_ucs.result | 4 +- mysql-test/main/ctype_utf8.result | 4 +- mysql-test/main/func_des_encrypt.result | 45 ++--- mysql-test/main/func_des_encrypt.test | 11 -- mysql-test/main/func_encrypt.result | 166 +++++++++--------- mysql-test/main/func_encrypt_nossl.result | 64 +++---- mysql-test/main/func_encrypt_ucs2.result | 8 +- mysql-test/main/func_group.result | 2 +- mysql-test/main/null.result | 2 +- mysql-test/main/ssl_and_innodb.result | 2 +- mysql-test/main/type_blob.result | 8 +- mysql-test/main/type_timestamp.result | 2 +- mysql-test/main/type_year.result | 32 ++-- .../binlog_encryption/rpl_gtid_basic.result | 6 +- .../engines/funcs/r/rpl_change_master.result | 2 +- .../suite/engines/iuds/r/delete_year.result | 8 +- .../suite/engines/iuds/r/insert_year.result | 16 +- .../suite/engines/iuds/r/update_year.result | 8 +- .../suite/funcs_1/r/innodb_views.result | 4 +- .../suite/funcs_1/r/is_columns_innodb.result | 6 +- .../suite/funcs_1/r/is_columns_memory.result | 6 +- .../suite/funcs_1/r/is_columns_myisam.result | 6 +- .../r/is_columns_myisam_embedded.result | 6 +- .../suite/funcs_1/r/memory_views.result | 4 +- .../suite/funcs_1/r/myisam_views-big.result | 4 +- mysql-test/suite/funcs_1/r/storedproc.result | 4 +- .../r/galera_query_cache_invalidate.result | 2 +- mysql-test/suite/innodb/r/data_types.result | 2 +- .../perfschema/r/dml_setup_timers.result | 34 ++-- .../perfschema/r/max_program_zero.result | 2 +- .../suite/perfschema/r/privilege.result | 8 +- .../suite/perfschema/r/query_cache.result | 4 +- .../r/socket_summary_by_instance_func.result | 4 +- .../r/start_server_disable_idle.result | 2 +- .../r/start_server_disable_stages.result | 2 +- .../r/start_server_disable_statements.result | 2 +- .../start_server_disable_transactions.result | 2 +- .../r/start_server_disable_waits.result | 2 +- .../perfschema/r/start_server_innodb.result | 2 +- .../r/start_server_low_index.result | 2 +- .../r/start_server_low_table_lock.result | 2 +- .../r/start_server_no_account.result | 2 +- .../r/start_server_no_cond_class.result | 2 +- .../r/start_server_no_cond_inst.result | 2 +- .../r/start_server_no_file_class.result | 2 +- .../r/start_server_no_file_inst.result | 2 +- .../perfschema/r/start_server_no_host.result | 2 +- .../perfschema/r/start_server_no_index.result | 2 +- .../perfschema/r/start_server_no_mdl.result | 2 +- .../r/start_server_no_memory_class.result | 2 +- .../r/start_server_no_mutex_class.result | 2 +- .../r/start_server_no_mutex_inst.result | 2 +- ..._server_no_prepared_stmts_instances.result | 2 +- .../r/start_server_no_rwlock_class.result | 2 +- .../r/start_server_no_rwlock_inst.result | 2 +- .../r/start_server_no_setup_actors.result | 2 +- .../r/start_server_no_setup_objects.result | 2 +- .../r/start_server_no_socket_class.result | 2 +- .../r/start_server_no_socket_inst.result | 2 +- .../r/start_server_no_stage_class.result | 2 +- .../r/start_server_no_stages_history.result | 2 +- ...start_server_no_stages_history_long.result | 2 +- .../r/start_server_no_statement_class.result | 2 +- .../start_server_no_statements_history.result | 2 +- ...t_server_no_statements_history_long.result | 2 +- .../r/start_server_no_table_hdl.result | 2 +- .../r/start_server_no_table_inst.result | 2 +- .../r/start_server_no_table_lock.result | 2 +- .../r/start_server_no_thread_class.result | 2 +- .../r/start_server_no_thread_inst.result | 2 +- ...tart_server_no_transactions_history.result | 2 +- ...server_no_transactions_history_long.result | 2 +- .../perfschema/r/start_server_no_user.result | 2 +- .../r/start_server_no_waits_history.result | 2 +- .../start_server_no_waits_history_long.result | 2 +- .../perfschema/r/start_server_nothing.result | 4 +- .../perfschema/r/start_server_off.result | 4 +- .../suite/perfschema/r/start_server_on.result | 2 +- .../r/start_server_variables.result | 2 +- .../r/statement_program_lost_inst.result | 2 +- .../suite/rpl/r/rpl_change_master.result | 2 +- mysql-test/suite/rpl/r/rpl_gtid_basic.result | 6 +- .../suite/rpl/r/rpl_gtid_errorhandling.result | 2 +- .../suite/rpl/r/rpl_gtid_mdev4820.result | 4 +- .../suite/rpl/r/rpl_old_master_29078.result | 2 +- .../suite/rpl/r/rpl_parallel_29322.result | 4 +- .../r/rpl_perfschema_connect_config.result | 2 +- .../rpl/r/rpl_start_alter_options.result | 10 +- mysql-test/suite/rpl/r/rpl_timestamp.result | 2 +- .../suite/rpl/r/rpl_using_gtid_default.result | 2 +- .../rpl/t/rpl_perfschema_connect_config.test | 4 - ...explicit_defaults_for_timestamp_off.result | 4 +- .../explicit_defaults_for_timestamp_on.result | 2 +- sql/deprecation.h | 53 ++++++ sql/field.cc | 4 +- sql/item_strfunc.cc | 8 +- sql/set_var.cc | 15 +- sql/sql_class.h | 2 + sql/sql_priv.h | 65 ------- sql/sql_repl.cc | 6 +- sql/sql_type.cc | 5 +- sql/sql_yacc.yy | 5 +- sql/sys_vars.cc | 28 ++- sql/sys_vars.inl | 2 +- storage/oqgraph/ha_oqgraph.cc | 3 +- storage/perfschema/table_setup_timers.cc | 7 +- .../rocksdb/r/col_opt_not_null.result | 6 +- .../mysql-test/rocksdb/r/col_opt_null.result | 8 +- .../rocksdb/r/type_date_time.result | 2 +- .../spider/r/variable_deprecation.result | 44 ++--- storage/spider/spd_table.cc | 55 +++--- 114 files changed, 439 insertions(+), 521 deletions(-) create mode 100644 sql/deprecation.h diff --git a/mysql-test/main/ctype_binary.result b/mysql-test/main/ctype_binary.result index 00ca8ac1cbf..25685e2732f 100644 --- a/mysql-test/main/ctype_binary.result +++ b/mysql-test/main/ctype_binary.result @@ -2040,7 +2040,7 @@ hex(concat(a)) a drop table t1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); select hex(concat(a)) from t1; hex(concat(a)) @@ -2355,7 +2355,7 @@ drop table t1; drop view v1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); create view v1(a) as select concat(a) from t1; show columns from v1; diff --git a/mysql-test/main/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result index 475058dc2bb..3702c9d860f 100644 --- a/mysql-test/main/ctype_cp1251.result +++ b/mysql-test/main/ctype_cp1251.result @@ -2452,7 +2452,7 @@ hex(concat(a)) a drop table t1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); select hex(concat(a)) from t1; hex(concat(a)) @@ -2767,7 +2767,7 @@ drop table t1; drop view v1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); create view v1(a) as select concat(a) from t1; show columns from v1; diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result index da95e0fb659..4c08f8f488b 100644 --- a/mysql-test/main/ctype_latin1.result +++ b/mysql-test/main/ctype_latin1.result @@ -2761,7 +2761,7 @@ hex(concat(a)) a drop table t1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); select hex(concat(a)) from t1; hex(concat(a)) @@ -3076,7 +3076,7 @@ drop table t1; drop view v1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); create view v1(a) as select concat(a) from t1; show columns from v1; diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index f4ca4089e55..99d8209d32e 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -3641,7 +3641,7 @@ hex(concat(a)) a drop table t1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); select hex(concat(a)) from t1; hex(concat(a)) @@ -3956,7 +3956,7 @@ drop table t1; drop view v1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); create view v1(a) as select concat(a) from t1; show columns from v1; diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index d94d66e5109..b02e07e96e2 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -4513,7 +4513,7 @@ hex(concat(a)) a drop table t1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); select hex(concat(a)) from t1; hex(concat(a)) @@ -4828,7 +4828,7 @@ drop table t1; drop view v1; create table t1 (a year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (1); create view v1(a) as select concat(a) from t1; show columns from v1; diff --git a/mysql-test/main/func_des_encrypt.result b/mysql-test/main/func_des_encrypt.result index 9ce577a5794..e24f6b32b56 100644 --- a/mysql-test/main/func_des_encrypt.result +++ b/mysql-test/main/func_des_encrypt.result @@ -2,7 +2,7 @@ select des_encrypt('hello'); des_encrypt('hello') €Ö2nV“Ø} Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release # # Bug #11643: des_encrypt() causes server to die # @@ -10,7 +10,7 @@ CREATE TABLE t1 (des VARBINARY(200) NOT NULL DEFAULT '') ENGINE=MyISAM; INSERT INTO t1 VALUES ('1234'), ('12345'), ('123456'), ('1234567'); UPDATE t1 SET des=DES_ENCRYPT('1234'); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release SELECT LENGTH(des) FROM t1; LENGTH(des) 9 @@ -24,7 +24,7 @@ DES_DECRYPT(des) 1234 1234 Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release SELECT LENGTH(DES_ENCRYPT('1234')), LENGTH(DES_ENCRYPT('12345')), @@ -33,10 +33,10 @@ LENGTH(DES_ENCRYPT('1234567')); LENGTH(DES_ENCRYPT('1234')) LENGTH(DES_ENCRYPT('12345')) LENGTH(DES_ENCRYPT('123456')) LENGTH(DES_ENCRYPT('1234567')) 9 9 9 9 Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release SELECT DES_DECRYPT(DES_ENCRYPT('1234')), DES_DECRYPT(DES_ENCRYPT('12345')), @@ -45,14 +45,14 @@ DES_DECRYPT(DES_ENCRYPT('1234567')); DES_DECRYPT(DES_ENCRYPT('1234')) DES_DECRYPT(DES_ENCRYPT('12345')) DES_DECRYPT(DES_ENCRYPT('123456')) DES_DECRYPT(DES_ENCRYPT('1234567')) 1234 12345 123456 1234567 Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release DROP TABLE t1; End of 5.0 tests # @@ -85,7 +85,7 @@ j 000000000009 j NULL NULL NULL Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release DROP TABLE t1; CREATE TABLE t1 (a INT); INSERT t1 VALUES (1),(2); @@ -94,19 +94,8 @@ CHAR_LENGTH(a) DES_DECRYPT(a) 1 ¢ 1 ¢ Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release DROP TABLE t1; # # End of 10.5 tests # -# -# MDEV-27104 deprecate DES_ENCRYPT/DECRYPT functions -# -# just show how to disable deprecation note -set sql_notes=0; -select hex(des_encrypt('a')); -hex(des_encrypt('a')) -80E4DE4136BA6CD7F3 -# -# End of 10.10 tests -# diff --git a/mysql-test/main/func_des_encrypt.test b/mysql-test/main/func_des_encrypt.test index 884fad54635..20e2196f45f 100644 --- a/mysql-test/main/func_des_encrypt.test +++ b/mysql-test/main/func_des_encrypt.test @@ -62,14 +62,3 @@ DROP TABLE t1; --echo # --echo # End of 10.5 tests --echo # - ---echo # ---echo # MDEV-27104 deprecate DES_ENCRYPT/DECRYPT functions ---echo # ---echo # just show how to disable deprecation note -set sql_notes=0; -select hex(des_encrypt('a')); - ---echo # ---echo # End of 10.10 tests ---echo # diff --git a/mysql-test/main/func_encrypt.result b/mysql-test/main/func_encrypt.result index 4570ff312cf..08e86578f8c 100644 --- a/mysql-test/main/func_encrypt.result +++ b/mysql-test/main/func_encrypt.result @@ -2,124 +2,124 @@ drop table if exists t1; create table t1 (x blob); insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('a','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','a')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('ab','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','ab')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abc','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abc')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcd','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcd')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcde','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcde')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcdef','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdef')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcdefg','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefg')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcdefgh','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefgh')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcdefghi','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefghi')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcdefghij','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefghij')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('abcdefghijk','The quick red fox jumped over the lazy brown dog')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefghijk')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('quick red fox jumped over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('red fox jumped over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('fox jumped over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('jumped over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('dog!','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('dog!!','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('dog!!!','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('dog!!!!','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('dog!!!!!','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('jumped over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release insert into t1 values (des_encrypt('jumped over the lazy brown dog','sabakala')); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release select hex(x), hex(des_decrypt(x,'sabakala')) from t1; hex(x) hex(des_decrypt(x,'sabakala')) FFA185A4656D113445E31D7A5B31BB57671A4CA9E21E63FE5D9C801E0CC7AA6190C13E269C2AE8D8060D3FB3FEA94FEC7FB006B9DCAC3E3E41 NULL @@ -163,7 +163,7 @@ FF9723312D26D9E6DA01D01A784A64DB9D 646F672121212121 FF8333F3DD21E4488F967E03DD12394813A49F72848BB49473D3CB1C8A1AACF220 6A756D706564206F76657220746865206C617A792062726F776E20646F67 FF8333F3DD21E4488F967E03DD12394813A49F72848BB49473D3CB1C8A1AACF220 6A756D706564206F76657220746865206C617A792062726F776E20646F67 Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(x,'sabakala') as s from t1 having s like '%dog%'; s The quick red fox jumped over the lazy brown dog @@ -184,120 +184,120 @@ dog!!!!! jumped over the lazy brown dog jumped over the lazy brown dog Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release drop table t1; select hex(des_encrypt("hello")),des_decrypt(des_encrypt("hello")); hex(des_encrypt("hello")) des_decrypt(des_encrypt("hello")) 85D6DC8859F9759BBB hello Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(des_encrypt("hello",4)); des_decrypt(des_encrypt("hello",4)) hello Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(des_encrypt("hello",'test'),'test'); des_decrypt(des_encrypt("hello",'test'),'test') hello Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select hex(des_encrypt("hello")),hex(des_encrypt("hello",5)),hex(des_encrypt("hello",'default_password')); hex(des_encrypt("hello")) hex(des_encrypt("hello",5)) hex(des_encrypt("hello",'default_password')) 85D6DC8859F9759BBB 85D6DC8859F9759BBB FFD6DC8859F9759BBB Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release select des_decrypt(des_encrypt("hello"),'default_password'); des_decrypt(des_encrypt("hello"),'default_password') hello Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(des_encrypt("hello",4),'password4'); des_decrypt(des_encrypt("hello",4),'password4') hello Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_encrypt("hello",10); des_encrypt("hello",10) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1108 Incorrect parameters to procedure 'des_encrypt' select des_encrypt(NULL); des_encrypt(NULL) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release select des_encrypt(NULL, 10); des_encrypt(NULL, 10) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release select des_encrypt(NULL, NULL); des_encrypt(NULL, NULL) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release select des_encrypt(10, NULL); des_encrypt(10, NULL) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1108 Incorrect parameters to procedure 'des_encrypt' select des_encrypt("hello", NULL); des_encrypt("hello", NULL) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1108 Incorrect parameters to procedure 'des_encrypt' select des_decrypt("hello",10); des_decrypt("hello",10) hello Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(NULL); des_decrypt(NULL) NULL Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(NULL, 10); des_decrypt(NULL, 10) NULL Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(NULL, NULL); des_decrypt(NULL, NULL) NULL Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt(10, NULL); des_decrypt(10, NULL) 10 Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select des_decrypt("hello", NULL); des_decrypt("hello", NULL) hello Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release SET @a=des_decrypt(des_encrypt("hello")); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release flush des_key_file; select @a = des_decrypt(des_encrypt("hello")); @a = des_decrypt(des_encrypt("hello")) 1 Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select hex("hello"); hex("hello") 68656C6C6F @@ -305,23 +305,23 @@ select hex(des_decrypt(des_encrypt("hello",4),'password2')); hex(des_decrypt(des_encrypt("hello",4),'password2')) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select hex(des_decrypt(des_encrypt("hello","hidden"))); hex(des_decrypt(des_encrypt("hello","hidden"))) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1108 Incorrect parameters to procedure 'des_decrypt' explain extended select des_decrypt(des_encrypt("hello",4),'password2'), des_decrypt(des_encrypt("hello","hidden")); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Note 1003 select des_decrypt(des_encrypt('hello',4),'password2') AS `des_decrypt(des_encrypt("hello",4),'password2')`,des_decrypt(des_encrypt('hello','hidden')) AS `des_decrypt(des_encrypt("hello","hidden"))` # # Start of 10.1 tests @@ -336,7 +336,7 @@ SELECT * FROM t1 WHERE a=1 AND DES_ENCRYPT('test',a)=_latin1 'abc' COLLATE latin id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = 1 and des_encrypt('test',`test`.`t1`.`a`) = 'abc' DROP TABLE t1; # @@ -354,8 +354,8 @@ b BLOB DEFAULT DES_ENCRYPT(a, 'passwd'), c TEXT DEFAULT DES_DECRYPT(b, 'passwd') ); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/main/func_encrypt_nossl.result b/mysql-test/main/func_encrypt_nossl.result index b28d4811433..ad068153e53 100644 --- a/mysql-test/main/func_encrypt_nossl.result +++ b/mysql-test/main/func_encrypt_nossl.result @@ -2,87 +2,87 @@ select des_encrypt("test", 'akeystr'); des_encrypt("test", 'akeystr') NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_encrypt("test", 1); des_encrypt("test", 1) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_encrypt("test", 9); des_encrypt("test", 9) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_encrypt("test", 100); des_encrypt("test", 100) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_encrypt("test", NULL); des_encrypt("test", NULL) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_encrypt(NULL, NULL); des_encrypt(NULL, NULL) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_decrypt("test", 'anotherkeystr'); des_decrypt("test", 'anotherkeystr') NULL Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_decrypt(1, 1); des_decrypt(1, 1) NULL Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_decrypt(des_encrypt("test", 'thekey')); des_decrypt(des_encrypt("test", 'thekey')) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select hex(des_encrypt("hello")),des_decrypt(des_encrypt("hello")); hex(des_encrypt("hello")) des_decrypt(des_encrypt("hello")) NULL NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_decrypt(des_encrypt("hello",4)); des_decrypt(des_encrypt("hello",4)) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_decrypt(des_encrypt("hello",'test'),'test'); des_decrypt(des_encrypt("hello",'test'),'test') NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select hex(des_encrypt("hello")),hex(des_encrypt("hello",5)),hex(des_encrypt("hello",'default_password')); hex(des_encrypt("hello")) hex(des_encrypt("hello",5)) hex(des_encrypt("hello",'default_password')) NULL NULL NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working @@ -90,28 +90,28 @@ select des_decrypt(des_encrypt("hello"),'default_password'); des_decrypt(des_encrypt("hello"),'default_password') NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select des_decrypt(des_encrypt("hello",4),'password4'); des_decrypt(des_encrypt("hello",4),'password4') NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working SET @a=des_decrypt(des_encrypt("hello")); Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working flush des_key_file; select @a = des_decrypt(des_encrypt("hello")); @a = des_decrypt(des_encrypt("hello")) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release select hex("hello"); hex("hello") 68656C6C6F @@ -119,13 +119,13 @@ select hex(des_decrypt(des_encrypt("hello",4),'password2')); hex(des_decrypt(des_encrypt("hello",4),'password2')) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working select hex(des_decrypt(des_encrypt("hello","hidden"))); hex(des_decrypt(des_encrypt("hello","hidden"))) NULL Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working diff --git a/mysql-test/main/func_encrypt_ucs2.result b/mysql-test/main/func_encrypt_ucs2.result index ab04c3b4621..0aed95c3eab 100644 --- a/mysql-test/main/func_encrypt_ucs2.result +++ b/mysql-test/main/func_encrypt_ucs2.result @@ -5,21 +5,21 @@ SELECT CHAR_LENGTH(DES_ENCRYPT(0, CHAR('1' USING ucs2))); CHAR_LENGTH(DES_ENCRYPT(0, CHAR('1' USING ucs2))) 9 Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release SELECT CONVERT(DES_ENCRYPT(0, CHAR('1' USING ucs2)),UNSIGNED); CONVERT(DES_ENCRYPT(0, CHAR('1' USING ucs2)),UNSIGNED) 0 Warnings: -Note 1287 'des_encrypt' is deprecated and will be removed in a future release +Warning 1287 'des_encrypt' is deprecated and will be removed in a future release Warning 1292 Truncated incorrect INTEGER value: '\xFFT\xDCiK\x92j\xE6\xFC' SELECT CHAR_LENGTH(DES_DECRYPT(0xFF0DC9FC9537CA75F4, CHAR('1' USING ucs2))) as a; a 4 Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release SELECT CONVERT(DES_DECRYPT(0xFF0DC9FC9537CA75F4, CHAR('1' using ucs2)), UNSIGNED) as a; a 0 Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release Warning 1292 Truncated incorrect INTEGER value: 'test' diff --git a/mysql-test/main/func_group.result b/mysql-test/main/func_group.result index 37420df6f00..6e58b4fc2c6 100644 --- a/mysql-test/main/func_group.result +++ b/mysql-test/main/func_group.result @@ -1532,7 +1532,7 @@ DROP TABLE t1; # create table t1 (f1 year(2), f2 year(4), f3 date, f4 datetime); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (98,1998,19980101,"1998-01-01 00:00:00"), (00,2000,20000101,"2000-01-01 00:00:01"), diff --git a/mysql-test/main/null.result b/mysql-test/main/null.result index 2653140dfc3..364b7f73202 100644 --- a/mysql-test/main/null.result +++ b/mysql-test/main/null.result @@ -442,7 +442,7 @@ NOT NOT NULLIF(2,3) # CREATE TABLE t1 (a YEAR(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO t1 VALUES (0); SELECT a,NULLIF(a,2000),NULLIF(2000,a) FROM t1; a NULLIF(a,2000) NULLIF(2000,a) diff --git a/mysql-test/main/ssl_and_innodb.result b/mysql-test/main/ssl_and_innodb.result index 21d98908517..ca6fef915bb 100644 --- a/mysql-test/main/ssl_and_innodb.result +++ b/mysql-test/main/ssl_and_innodb.result @@ -6,5 +6,5 @@ FROM t1 ; d 2 Warnings: -Note 1287 'des_decrypt' is deprecated and will be removed in a future release +Warning 1287 'des_decrypt' is deprecated and will be removed in a future release DROP TABLE t1; diff --git a/mysql-test/main/type_blob.result b/mysql-test/main/type_blob.result index b5e88e66028..38b7bd30ff9 100644 --- a/mysql-test/main/type_blob.result +++ b/mysql-test/main/type_blob.result @@ -901,7 +901,7 @@ CREATE TABLE b15776 (a char(4294967296)); ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead CREATE TABLE b15776 (a year(?)); Warnings: -Note 1287 'YEAR(?)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(?)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO b15776 VALUES (42); SELECT * FROM b15776; a @@ -909,7 +909,7 @@ a DROP TABLE b15776; CREATE TABLE b15776 (a year(4294967296)); Warnings: -Note 1287 'YEAR(4294967295)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(4294967295)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE b15776; Table Create Table b15776 CREATE TABLE `b15776` ( @@ -918,7 +918,7 @@ b15776 CREATE TABLE `b15776` ( DROP TABLE b15776; CREATE TABLE b15776 (a year(0)); Warnings: -Note 1287 'YEAR(0)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(0)' is deprecated and will be removed in a future release. Please use YEAR(4) instead DROP TABLE b15776; CREATE TABLE b15776 (a year(-2)); ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2))' at line 1 @@ -938,7 +938,7 @@ CREATE TABLE b15776 (a char(9999999999999999999999999999999999999999999999999999 ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead CREATE TABLE b15776 (a year(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999)); Warnings: -Note 1287 'YEAR(4294967295)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(4294967295)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE b15776; Table Create Table b15776 CREATE TABLE `b15776` ( diff --git a/mysql-test/main/type_timestamp.result b/mysql-test/main/type_timestamp.result index 064dee6715d..8646b1f1d18 100644 --- a/mysql-test/main/type_timestamp.result +++ b/mysql-test/main/type_timestamp.result @@ -1351,7 +1351,7 @@ SET time_zone=DEFAULT; # set explicit_defaults_for_timestamp=OFF; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release create table t1 (f1 timestamp, f2 timestamp); show create table t1; Table Create Table diff --git a/mysql-test/main/type_year.result b/mysql-test/main/type_year.result index aaee5049c63..cb5cce41232 100644 --- a/mysql-test/main/type_year.result +++ b/mysql-test/main/type_year.result @@ -1,6 +1,6 @@ create table t1 (y year,y2 year(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert into t1 values (0,0),(1999,1999),(2000,2000),(2001,2001),(70,70),(69,69); select * from t1; y y2 @@ -60,7 +60,7 @@ drop table t1; # CREATE TABLE t2(yy YEAR(2), c2 CHAR(4)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CREATE TABLE t4(yyyy YEAR(4), c4 CHAR(4)); INSERT INTO t2 (c2) VALUES (NULL),(1970),(1999),(2000),(2001),(2069); INSERT INTO t4 (c4) SELECT c2 FROM t2; @@ -373,11 +373,11 @@ DROP TABLE t1; # CREATE TABLE t1 (c1 YEAR(2), c2 YEAR(4)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead ALTER TABLE t1 MODIFY COLUMN c2 YEAR(2); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead DROP TABLE t1; # # End of 5.1 tests @@ -385,7 +385,7 @@ DROP TABLE t1; create function y2k() returns int deterministic return 2000; create table t1 (a year(2), b int); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead insert t1 values (0,2000); select a from t1 where a=2000; a @@ -509,7 +509,7 @@ DROP TABLE t1; # create or replace table t1 (a YEAR(0)); Warnings: -Note 1287 'YEAR(0)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(0)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -517,7 +517,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t1 (a YEAR(1)); Warnings: -Note 1287 'YEAR(1)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(1)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -525,7 +525,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t1 (a YEAR(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -533,7 +533,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t1 (a YEAR(3)); Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -547,7 +547,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t1 (a YEAR(5)); Warnings: -Note 1287 'YEAR(5)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(5)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -555,7 +555,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create or replace table t1 (a YEAR(100)); Warnings: -Note 1287 'YEAR(100)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(100)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -588,7 +588,7 @@ Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = DROP TABLE t1; CREATE TABLE t1 (a YEAR(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO t1 VALUES (93),(94); SELECT * FROM t1; a @@ -620,7 +620,7 @@ MIN(a) MAX(a) DROP TABLE t1; CREATE OR REPLACE TABLE t1 (a YEAR(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO t1 VALUES (1970),(1978),(2000),(2069); SELECT a, CAST(a AS DATE), CAST(COALESCE(a) AS DATE) FROM t1; a CAST(a AS DATE) CAST(COALESCE(a) AS DATE) @@ -652,10 +652,10 @@ DROP TABLE t1; # CREATE TABLE t1 (a YEAR(2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CREATE TABLE t2 AS SELECT a, ROUND(a), TRUNCATE(a,0), FLOOR(a), CEILING(a) FROM t1; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead DESC t2; Field Type Null Key Default Extra a year(2) YES NULL diff --git a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result index 2bdfe0b1c52..0246a9e2900 100644 --- a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result +++ b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.result @@ -70,7 +70,7 @@ connection server_4; CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc SELECT * FROM t1 ORDER BY a; a b @@ -92,7 +92,7 @@ include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc connection server_4; UPDATE t2 SET b="j1a" WHERE a=5; @@ -122,7 +122,7 @@ connection server_3; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc include/sync_with_master_gtid.inc SELECT * FROM t2 ORDER BY a; diff --git a/mysql-test/suite/engines/funcs/r/rpl_change_master.result b/mysql-test/suite/engines/funcs/r/rpl_change_master.result index 88801b07bba..59d83a1e385 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_change_master.result +++ b/mysql-test/suite/engines/funcs/r/rpl_change_master.result @@ -29,6 +29,6 @@ CHANGE MASTER TO MASTER_USER='root', MASTER_PASSWORD='', MASTER_SSL=0; "Usage of CURRENT_POS in CHANGE MASTER MASTER_USE_GTID is dreprecated. CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS; include/rpl_end.inc diff --git a/mysql-test/suite/engines/iuds/r/delete_year.result b/mysql-test/suite/engines/iuds/r/delete_year.result index c82f0dae7d9..9a2cf7504f4 100644 --- a/mysql-test/suite/engines/iuds/r/delete_year.result +++ b/mysql-test/suite/engines/iuds/r/delete_year.result @@ -3,12 +3,12 @@ CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1)); CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2)); CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); diff --git a/mysql-test/suite/engines/iuds/r/insert_year.result b/mysql-test/suite/engines/iuds/r/insert_year.result index 8065f606aab..4bd5e618924 100644 --- a/mysql-test/suite/engines/iuds/r/insert_year.result +++ b/mysql-test/suite/engines/iuds/r/insert_year.result @@ -3250,20 +3250,20 @@ c1 c2 c3 c4 DROP TABLE t1,t2,t3,t4; CREATE TABLE t1(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CREATE TABLE t2(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CREATE TABLE t3(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CREATE TABLE t4(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO t1 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45'); INSERT INTO t2 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45'); INSERT INTO t3 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45'); diff --git a/mysql-test/suite/engines/iuds/r/update_year.result b/mysql-test/suite/engines/iuds/r/update_year.result index b766531f083..f465e22e117 100644 --- a/mysql-test/suite/engines/iuds/r/update_year.result +++ b/mysql-test/suite/engines/iuds/r/update_year.result @@ -3,12 +3,12 @@ CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1)); CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2)); CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2)); Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result index 90d72b451b9..02061c1bec5 100644 --- a/mysql-test/suite/funcs_1/r/innodb_views.result +++ b/mysql-test/suite/funcs_1/r/innodb_views.result @@ -54,7 +54,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = innodb; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/innodb_tb2.txt' into table tb2; DROP DATABASE IF EXISTS test1; @@ -115,7 +115,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = innodb; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/innodb_tb2.txt' into table tb2; USE test; diff --git a/mysql-test/suite/funcs_1/r/is_columns_innodb.result b/mysql-test/suite/funcs_1/r/is_columns_innodb.result index beb8ad88de1..1f0649e794e 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_innodb.result +++ b/mysql-test/suite/funcs_1/r/is_columns_innodb.result @@ -133,7 +133,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = innodb; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/innodb_tb2.txt' into table tb2; drop table if exists tb3 ; @@ -265,7 +265,7 @@ f240 varchar(2000), f241 char(100) ) engine = innodb; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/innodb_tb4.txt' into table tb4; USE test1; @@ -324,7 +324,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = innodb; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/innodb_tb2.txt' into table tb2; USE test; diff --git a/mysql-test/suite/funcs_1/r/is_columns_memory.result b/mysql-test/suite/funcs_1/r/is_columns_memory.result index b33d6a28efb..31891e6ab4d 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_memory.result +++ b/mysql-test/suite/funcs_1/r/is_columns_memory.result @@ -129,7 +129,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = memory; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/memory_tb2.txt' into table tb2 ; drop table if exists tb3; @@ -254,7 +254,7 @@ f239 varbinary(0), f240 varchar(1200) ) engine = memory; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/memory_tb4.txt' into table tb4; USE test1; @@ -313,7 +313,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = memory; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/memory_tb2.txt' into table tb2 ; USE test; diff --git a/mysql-test/suite/funcs_1/r/is_columns_myisam.result b/mysql-test/suite/funcs_1/r/is_columns_myisam.result index e7a8a176188..9e0bab8e98f 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_myisam.result +++ b/mysql-test/suite/funcs_1/r/is_columns_myisam.result @@ -145,7 +145,7 @@ f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb2.txt' into table tb2; drop table if exists tb3 ; @@ -286,7 +286,7 @@ f241 char(100), f242 bit(30) ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb4.txt' into table tb4; USE test1; @@ -353,7 +353,7 @@ f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb2.txt' into table tb2; USE test; diff --git a/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result index d44732f5dd5..df85bd147db 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result @@ -145,7 +145,7 @@ f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb2.txt' into table tb2; drop table if exists tb3 ; @@ -286,7 +286,7 @@ f241 char(100), f242 bit(30) ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb4.txt' into table tb4; USE test1; @@ -353,7 +353,7 @@ f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb2.txt' into table tb2; USE test; diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result index 417c0e85188..f8542e7e478 100644 --- a/mysql-test/suite/funcs_1/r/memory_views.result +++ b/mysql-test/suite/funcs_1/r/memory_views.result @@ -55,7 +55,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = memory; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/memory_tb2.txt' into table tb2 ; DROP DATABASE IF EXISTS test1; @@ -116,7 +116,7 @@ f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = memory; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/memory_tb2.txt' into table tb2 ; USE test; diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result index efd5ee1c568..7b9421f2b41 100644 --- a/mysql-test/suite/funcs_1/r/myisam_views-big.result +++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result @@ -63,7 +63,7 @@ f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb2.txt' into table tb2; DROP DATABASE IF EXISTS test1; @@ -132,7 +132,7 @@ f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '/std_data/funcs_1/myisam_tb2.txt' into table tb2; USE test; diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result index 6b10384744c..34185710905 100644 --- a/mysql-test/suite/funcs_1/r/storedproc.result +++ b/mysql-test/suite/funcs_1/r/storedproc.result @@ -7484,12 +7484,12 @@ declare x, y, z year(3) default 2005; SELECT x, y, z; END// Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead CALL sp1(); x y z 2005 2005 2005 Warnings: -Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) BEGIN diff --git a/mysql-test/suite/galera/r/galera_query_cache_invalidate.result b/mysql-test/suite/galera/r/galera_query_cache_invalidate.result index 4a6b61e4d80..1c1ba1dd449 100644 --- a/mysql-test/suite/galera/r/galera_query_cache_invalidate.result +++ b/mysql-test/suite/galera/r/galera_query_cache_invalidate.result @@ -9,7 +9,7 @@ call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node."); connection node_3; CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos;; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead START SLAVE; include/wait_for_slave_to_start.inc connection node_1; diff --git a/mysql-test/suite/innodb/r/data_types.result b/mysql-test/suite/innodb/r/data_types.result index 146f9bb080f..695059bf288 100644 --- a/mysql-test/suite/innodb/r/data_types.result +++ b/mysql-test/suite/innodb/r/data_types.result @@ -82,7 +82,7 @@ t1_VARCHAR_0 VARCHAR(0), t1_VARMYSQL_0 VARCHAR(0) CHARACTER SET utf8 ) ENGINE=InnoDB; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead INSERT INTO t1 () VALUES (); SELECT name, diff --git a/mysql-test/suite/perfschema/r/dml_setup_timers.result b/mysql-test/suite/perfschema/r/dml_setup_timers.result index 6f5a1f5cb4b..55ccfaf431b 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_timers.result +++ b/mysql-test/suite/perfschema/r/dml_setup_timers.result @@ -1,23 +1,23 @@ update performance_schema.setup_timers set timer_name='CYCLE' where name="wait"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='NANOSECOND' where name="stage"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='NANOSECOND' where name="statement"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='MICROSECOND' where name="transaction"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='MICROSECOND' where name="idle"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.setup_timers; NAME TIMER_NAME idle MICROSECOND @@ -26,19 +26,19 @@ stage NANOSECOND statement NANOSECOND transaction MICROSECOND Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.setup_timers where name='Wait'; NAME TIMER_NAME wait CYCLE Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.setup_timers where timer_name='CYCLE'; NAME TIMER_NAME wait CYCLE Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release insert into performance_schema.setup_timers set name='FOO', timer_name='CYCLE'; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers` @@ -48,7 +48,7 @@ ERROR HY000: Invalid performance_schema usage update performance_schema.setup_timers set timer_name='MILLISECOND'; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.setup_timers; NAME TIMER_NAME idle MILLISECOND @@ -57,11 +57,11 @@ stage MILLISECOND statement MILLISECOND transaction MILLISECOND Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='CYCLE'; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release delete from performance_schema.setup_timers; ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers` delete from performance_schema.setup_timers @@ -74,23 +74,23 @@ UNLOCK TABLES; update performance_schema.setup_timers set timer_name='CYCLE' where name="wait"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='NANOSECOND' where name="stage"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='NANOSECOND' where name="statement"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='MICROSECOND' where name="transaction"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release update performance_schema.setup_timers set timer_name='MICROSECOND' where name="idle"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.setup_timers; NAME TIMER_NAME idle MICROSECOND @@ -99,7 +99,7 @@ stage NANOSECOND statement NANOSECOND transaction MICROSECOND Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release # # MDEV-25325 column_comment for performance_schema tables # diff --git a/mysql-test/suite/perfschema/r/max_program_zero.result b/mysql-test/suite/perfschema/r/max_program_zero.result index 5435efb34ae..a825e864a60 100644 --- a/mysql-test/suite/perfschema/r/max_program_zero.result +++ b/mysql-test/suite/perfschema/r/max_program_zero.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result index 75b018426bc..b4dd42a6d19 100644 --- a/mysql-test/suite/perfschema/r/privilege.result +++ b/mysql-test/suite/perfschema/r/privilege.result @@ -585,7 +585,7 @@ WHERE name LIKE 'wait/synch/mutex/%' UPDATE performance_schema.setup_consumers SET enabled = 'YES'; UPDATE performance_schema.setup_timers SET timer_name = 'TICK' WHERE name <> "wait"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release TRUNCATE TABLE performance_schema.events_waits_history_long; TRUNCATE TABLE performance_schema.events_waits_history; TRUNCATE TABLE performance_schema.events_waits_current; @@ -599,13 +599,13 @@ UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; UPDATE performance_schema.setup_consumers SET enabled = 'YES'; UPDATE performance_schema.setup_timers SET timer_name = 'MICROSECOND' where name="idle"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="stage"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="statement"; Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release # # WL#2284: Increase the length of a user name # diff --git a/mysql-test/suite/perfschema/r/query_cache.result b/mysql-test/suite/perfschema/r/query_cache.result index a84fff60431..41d7d483634 100644 --- a/mysql-test/suite/perfschema/r/query_cache.result +++ b/mysql-test/suite/perfschema/r/query_cache.result @@ -41,7 +41,7 @@ select * from performance_schema.setup_timers where name='wait'; NAME TIMER_NAME wait {CYCLE_OR_NANOSECOND} Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release show global status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 1 @@ -58,7 +58,7 @@ select * from performance_schema.setup_timers where name='wait'; NAME TIMER_NAME wait {CYCLE_OR_NANOSECOND} Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release show global status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 1 diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result index a70ff6149eb..52ac4c952a9 100644 --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result @@ -8,7 +8,7 @@ # # 0. Check, build or set prequisites Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release UPDATE performance_schema.threads SET INSTRUMENTED='NO' WHERE PROCESSLIST_ID = CONNECTION_ID(); # 1. Basic checks @@ -222,5 +222,5 @@ connection default; TRUNCATE TABLE performance_schema.socket_summary_by_instance; # 6. Cleanup Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release connection default; diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result index bfc49fd3480..9235faf735e 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index e9f20398467..3436faf1df0 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index ffb45f4f55f..24f504e67f0 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result index e271d5a10e6..e13ced555d7 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index 833da22583e..18448f00b01 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index e3ff0f514a7..80fd0d387de 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_low_index.result b/mysql-test/suite/perfschema/r/start_server_low_index.result index ffdf9d65b87..2a3c6bcff54 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_index.result +++ b/mysql-test/suite/perfschema/r/start_server_low_index.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result index dbb404f6129..c1c59b4da52 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result index f92b0e6bec6..6ae5b3b58e0 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index fefad55c209..ac0554cc634 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index 0c2f65f6ac9..81e6eb25e69 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index c3f06b53425..31c1049dfef 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index fd39807d567..384a1f9ca81 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index 43111c5ec40..b9949956aa4 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_index.result b/mysql-test/suite/perfschema/r/start_server_no_index.result index 15d1184bcbe..8f0be8241a0 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_index.result +++ b/mysql-test/suite/perfschema/r/start_server_no_index.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_mdl.result b/mysql-test/suite/perfschema/r/start_server_no_mdl.result index b8de90453ce..f5f7691e1c4 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mdl.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result index 60066264c90..1b71c3e4406 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index 3353b46bbcb..5b6545aa9f3 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index d41da361733..b657f234d18 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result index 4919de6bb6c..7f40850f123 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result +++ b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index 02a119bdc68..1db87999a14 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index ead01ce2d0e..a8e3ef23440 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index a99f1c0f9be..bfbdb5bf2cc 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index 7c148889412..549ee06a4bb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index dec0680c511..2a98e896fbc 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 20adf1a9f64..8c509c8b412 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index 044f9475041..72c9cd336fa 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 350f2c6637d..1ed72609619 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index d2d7063c32f..37a0dc0e15b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result index ca7c49cd51a..67275e600ba 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result index 8bcb3c56a00..9fe2a45d466 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index 2a2bf5d3f7c..1d780f630d8 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index ec6e40acc00..f053f8beb09 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index b3f1e4cbcf2..5d08edc2210 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result index baf9f761358..50295ea306f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index cd204f3d811..82b3b3b5f8b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index d083484cd7c..67a40ace6c0 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result index f5a12e5473d..d281c4daaea 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result index 76ae9d5fa4e..69582327979 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index 4bd472a22a9..423616c4aaf 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index f59b156ce1e..024f9adc2fa 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index cc70572c7ef..c890c48500d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index 985282c0168..edbe7bbc92b 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; @@ -302,7 +302,7 @@ stage statement transaction Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS select * from performance_schema.cond_instances; diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index a53d591938c..b62ffb83f75 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 0 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; @@ -198,7 +198,7 @@ OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED select * from performance_schema.setup_timers; NAME TIMER_NAME Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release insert into performance_schema.setup_objects values ('TABLE', 'myschema', 'myobject', 'YES', 'YES'); ERROR HY000: Invalid performance_schema usage insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole', 'YES', 'YES'); diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index e3ff0f514a7..80fd0d387de 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/start_server_variables.result b/mysql-test/suite/perfschema/r/start_server_variables.result index 7d1d1e05375..afd79f0a544 100644 --- a/mysql-test/suite/perfschema/r/start_server_variables.result +++ b/mysql-test/suite/perfschema/r/start_server_variables.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result index 05ec7b0b2b5..2c9d768f2a4 100644 --- a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result +++ b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result @@ -19,7 +19,7 @@ select count(*) from performance_schema.setup_timers; count(*) 5 Warnings: -Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release +Warning 1287 'performance_schema.setup_timers' is deprecated and will be removed in a future release select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; diff --git a/mysql-test/suite/rpl/r/rpl_change_master.result b/mysql-test/suite/rpl/r/rpl_change_master.result index 88801b07bba..59d83a1e385 100644 --- a/mysql-test/suite/rpl/r/rpl_change_master.result +++ b/mysql-test/suite/rpl/r/rpl_change_master.result @@ -29,6 +29,6 @@ CHANGE MASTER TO MASTER_USER='root', MASTER_PASSWORD='', MASTER_SSL=0; "Usage of CURRENT_POS in CHANGE MASTER MASTER_USE_GTID is dreprecated. CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_gtid_basic.result b/mysql-test/suite/rpl/r/rpl_gtid_basic.result index 584499a9e1e..51ca4c62433 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_basic.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_basic.result @@ -70,7 +70,7 @@ connection server_4; CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc SELECT * FROM t1 ORDER BY a; a b @@ -92,7 +92,7 @@ include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc connection server_4; UPDATE t2 SET b="j1a" WHERE a=5; @@ -122,7 +122,7 @@ connection server_3; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4, MASTER_USE_GTID=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc include/sync_with_master_gtid.inc SELECT * FROM t2 ORDER BY a; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result index a7cb710cc07..f832f3c5682 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result @@ -76,7 +76,7 @@ SET sql_log_bin = 1; INSERT INTO t1 VALUES (3); CHANGE MASTER TO master_use_gtid=current_pos; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead BEGIN; SET GLOBAL gtid_slave_pos = "100-100-100"; ERROR 25000: You are not allowed to execute this command in a transaction diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result b/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result index cea5aaaeacd..0eb9a0e9e24 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result @@ -46,7 +46,7 @@ connection server_1; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, master_user= 'root', master_use_gtid=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead START SLAVE; connection server_2; INSERT INTO t1 VALUES (11); @@ -77,7 +77,7 @@ INSERT INTO t1 VALUES (22); CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, master_user= 'root', master_use_gtid=CURRENT_POS; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead START SLAVE; SET sql_log_bin= 0; CALL mtr.add_suppression("which is not in the master's binlog. Since the master's binlog contains GTIDs with higher sequence numbers, it probably means that the slave has diverged"); diff --git a/mysql-test/suite/rpl/r/rpl_old_master_29078.result b/mysql-test/suite/rpl/r/rpl_old_master_29078.result index 163d13e9897..911705d1269 100644 --- a/mysql-test/suite/rpl/r/rpl_old_master_29078.result +++ b/mysql-test/suite/rpl/r/rpl_old_master_29078.result @@ -49,7 +49,7 @@ ROLLBACK /* added by mysqlbinlog */; connection slave; set global explicit_defaults_for_timestamp=0; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release include/reset_slave.inc include/start_slave.inc show create table t1; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_29322.result b/mysql-test/suite/rpl/r/rpl_parallel_29322.result index 5175f919d40..781804100e0 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_29322.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_29322.result @@ -11,7 +11,7 @@ connection slave; set @sav.explicit_defaults_for_timestamp = @@global.explicit_defaults_for_timestamp; set global explicit_defaults_for_timestamp = 0; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release set @sav.slave_parallel_workers = @@global.slave_parallel_workers; include/stop_slave.inc set @@global.slave_parallel_workers = 1; @@ -108,7 +108,7 @@ connection slave; connection master; set @@session.explicit_defaults_for_timestamp = 0; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release connection slave; set @@global.explicit_defaults_for_timestamp = 1; connection slave; diff --git a/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result b/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result index 27cb29d3968..d45fc2397f7 100644 --- a/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result +++ b/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result @@ -88,7 +88,7 @@ change master to master_user = 'root', master_use_gtid= CURRENT_POS; Warnings: -Warning #### 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/assert.inc [Value returned by SSS and PS table for Using_Gtid should be same.] # 3) Test for Auto_position= SLAVE_POS diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_options.result b/mysql-test/suite/rpl/r/rpl_start_alter_options.result index 4c6135aaf5e..9a6388412d6 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_options.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_options.result @@ -4,7 +4,7 @@ connection slave; stop slave; change master to master_use_gtid= current_pos; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -97,7 +97,7 @@ connection slave; stop slave; change master to master_use_gtid= current_pos; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -190,7 +190,7 @@ connection slave; stop slave; change master to master_use_gtid= current_pos; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -322,7 +322,7 @@ connection slave; stop slave; change master to master_use_gtid= current_pos; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; @@ -415,7 +415,7 @@ connection slave; stop slave; change master to master_use_gtid= current_pos; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead SET GLOBAL slave_parallel_threads=4; set global slave_parallel_mode=optimistic; set global gtid_strict_mode=1; diff --git a/mysql-test/suite/rpl/r/rpl_timestamp.result b/mysql-test/suite/rpl/r/rpl_timestamp.result index a2b15fe45b7..929d3d952dc 100644 --- a/mysql-test/suite/rpl/r/rpl_timestamp.result +++ b/mysql-test/suite/rpl/r/rpl_timestamp.result @@ -3,7 +3,7 @@ include/master-slave.inc set timestamp=1656940000; set explicit_defaults_for_timestamp=!@@explicit_defaults_for_timestamp; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release connection master; create table t1 (f1 timestamp, f2 timestamp); show create table t1; diff --git a/mysql-test/suite/rpl/r/rpl_using_gtid_default.result b/mysql-test/suite/rpl/r/rpl_using_gtid_default.result index e077bcd91a4..8a257195cfa 100644 --- a/mysql-test/suite/rpl/r/rpl_using_gtid_default.result +++ b/mysql-test/suite/rpl/r/rpl_using_gtid_default.result @@ -59,7 +59,7 @@ include/start_slave.inc include/stop_slave.inc CHANGE MASTER TO MASTER_USE_GTID=Current_Pos; Warnings: -Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead +Warning 1287 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead include/start_slave.inc include/stop_slave.inc RESET SLAVE; diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test b/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test index 7b2bf8d57d0..244495c0b9e 100644 --- a/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test +++ b/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test @@ -161,7 +161,6 @@ grant replication slave on *.* to replssl@localhost require ssl; # Setup slave to use SSL for connection to master --source include/stop_slave.inc replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR; -replace_column 2 ####; eval change master to master_user= 'replssl', master_password= '', @@ -244,7 +243,6 @@ CHANGE MASTER TO --echo # 1) Test for MASTER_USE_GTID=NO --echo --source include/stop_slave.inc -replace_column 2 ####; change master to master_user = 'root', master_use_gtid = NO; @@ -258,7 +256,6 @@ source include/assert.inc; --echo --echo # 2) Test for Auto_position= CURRENT_POS. --echo -replace_column 2 ####; change master to master_user = 'root', master_use_gtid= CURRENT_POS; @@ -272,7 +269,6 @@ source include/assert.inc; --echo --echo # 3) Test for Auto_position= SLAVE_POS --echo -replace_column 2 ####; change master to master_user = 'root', master_use_gtid= SLAVE_POS; diff --git a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result index a373e6aefca..7cdf564ca07 100644 --- a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result +++ b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result @@ -1,6 +1,6 @@ set @@explicit_defaults_for_timestamp=0; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release CREATE TABLE t1 (a TIMESTAMP); SHOW CREATE TABLE t1; Table Create Table @@ -227,7 +227,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci set explicit_defaults_for_timestamp=1-@@explicit_defaults_for_timestamp; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release execute stmt; show create table t1; Table Create Table diff --git a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result index 37d5a82b021..cbb4834dffd 100644 --- a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result +++ b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result @@ -234,7 +234,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci set explicit_defaults_for_timestamp=1-@@explicit_defaults_for_timestamp; Warnings: -Warning 1681 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release execute stmt; show create table t1; Table Create Table diff --git a/sql/deprecation.h b/sql/deprecation.h new file mode 100644 index 00000000000..428b13f62c7 --- /dev/null +++ b/sql/deprecation.h @@ -0,0 +1,53 @@ +/* + +In the current release model, versions are released like the following +(the table shows the year/quarter of the planned GA release): + + Q1 Q2 Q3 Q4 +2022 10.7 10.8 10.9 10.10 +2023 10.11-LTS 11.0 11.1 11.2 +2024 11.3 11.4 11.5 11.6 +2025 11.7-LTS 12.0 12.1 12.2 +2026 12.3 12.4 12.5 12.6 +2027 12.7-LTS 13.0 13.1 13.2 +2028 13.3 13.4 13.5 13.6 +2029 13.7-LTS 14.0 14.1 14.2 +... + +A deprecated feature can be removed only when all releases when it's +not deprecated have reached EOL. For example, if something was +deprecated in 11.3, then 10.11 (where it wasn't deprecated) will reach +EOL in Q1 2028 (standard 5 years LTS life time). Meaning, the feature can +be removed in 13.4. + +When the release model changes, the table above and templates below +have to be updated. +*/ + +template static inline void check_deprecated_version(void) +{ + static_assert ( + V <= 1004 ? MYSQL_VERSION_ID < 110500 : /* until 10.4 EOL */ + V <= 1005 ? MYSQL_VERSION_ID < 120100 : /* until 10.5 EOL */ + V <= 1010 ? MYSQL_VERSION_ID < 120500 : /* until 10.6 EOL */ + V <= 1106 ? MYSQL_VERSION_ID < 130400 : /* until 10.11 EOL */ + V == 999999, /* only for sys_var::do_deprecated_warning() */ + "check_deprecated_version failed" + ); +} + +template static inline void warn_deprecated(THD *thd, + const char *what, const char *to= NULL) +{ + check_deprecated_version(); + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, + ER_WARN_DEPRECATED_SYNTAX, ER_THD(thd, to && *to + ? ER_WARN_DEPRECATED_SYNTAX + : ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), + what, to); +} + +/* Prevent direct usage of the error that bypasses the template */ +#undef ER_WARN_DEPRECATED_SYNTAX +#undef ER_WARN_DEPRECATED_SYNTAX_WITH_VER +#undef ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT diff --git a/sql/field.cc b/sql/field.cc index 69187274dad..2cb7aa3e156 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -11059,9 +11059,7 @@ bool Column_definition::set_compressed(const char *method) bool Column_definition::set_compressed_deprecated(THD *thd, const char *method) { - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX), + warn_deprecated<1004>(thd, " ... COMPRESSED...", "' COMPRESSED... ...'"); return set_compressed(method); diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index a29ef6c4bca..b18e4684060 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -905,9 +905,7 @@ bool Item_func_des_encrypt::fix_length_and_dec(THD *thd) set_maybe_null(); /* 9 = MAX ((8- (arg_len % 8)) + 1) */ max_length = args[0]->max_length + 9; - push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, ER_WARN_DEPRECATED_SYNTAX, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), - func_name_cstring().str); + warn_deprecated<1010>(thd, func_name_cstring().str); return FALSE; } @@ -1018,9 +1016,7 @@ bool Item_func_des_decrypt::fix_length_and_dec(THD *thd) max_length= args[0]->max_length; if (max_length >= 9U) max_length-= 9U; - push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, ER_WARN_DEPRECATED_SYNTAX, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), - func_name_cstring().str); + warn_deprecated<1010>(thd, func_name_cstring().str); return FALSE; } diff --git a/sql/set_var.cc b/sql/set_var.cc index 9fd5aa318c9..61528b45de6 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -424,20 +424,7 @@ void sys_var::do_deprecated_warning(THD *thd) { char buf1[NAME_CHAR_LEN + 3]; strxnmov(buf1, sizeof(buf1)-1, "@@", name.str, 0); - - /* - if deprecation_substitute is an empty string, - there is no replacement for the syntax - */ - uint errmsg= deprecation_substitute[0] == '\0' - ? ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT - : ER_WARN_DEPRECATED_SYNTAX; - if (thd) - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX, ER_THD(thd, errmsg), - buf1, deprecation_substitute); - else - sql_print_warning(ER_DEFAULT(errmsg), buf1, deprecation_substitute); + warn_deprecated<999999>(thd, buf1, deprecation_substitute); } } diff --git a/sql/sql_class.h b/sql/sql_class.h index e5685bd68ad..906b09c388e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -8220,5 +8220,7 @@ public: LEX_CSTRING make_string(THD *thd, const char *start_ptr, const char *end_ptr); +#include "deprecation.h" + #endif /* MYSQL_SERVER */ #endif /* SQL_CLASS_INCLUDED */ diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 554b86dc7ab..f5b408039c5 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -27,71 +27,6 @@ #ifndef SQL_PRIV_INCLUDED #define SQL_PRIV_INCLUDED -#ifndef MYSQL_CLIENT - -/* - Generates a warning that a feature is deprecated. After a specified - version asserts that the feature is removed. - - Using it as - - WARN_DEPRECATED(thd, 6,2, "BAD", "'GOOD'"); - - Will result in a warning - - "The syntax 'BAD' is deprecated and will be removed in MySQL 6.2. Please - use 'GOOD' instead" - - Note that in macro arguments BAD is not quoted, while 'GOOD' is. - Note that the version is TWO numbers, separated with a comma - (two macro arguments, that is) -*/ -#define WARN_DEPRECATED(Thd,VerHi,VerLo,Old,New) \ - do { \ - compile_time_assert(MYSQL_VERSION_ID < VerHi * 10000 + VerLo * 100); \ - if (((THD *) Thd) != NULL) \ - push_warning_printf(((THD *) Thd), Sql_condition::WARN_LEVEL_WARN, \ - ER_WARN_DEPRECATED_SYNTAX, \ - ER_THD(((THD *) Thd), ER_WARN_DEPRECATED_SYNTAX), \ - (Old), (New)); \ - else \ - sql_print_warning("The syntax '%s' is deprecated and will be removed " \ - "in a future release. Please use %s instead.", \ - (Old), (New)); \ - } while(0) - - -/* - Generates a warning that a feature is deprecated and there is no replacement. - - Using it as - - WARN_DEPRECATED_NO_REPLACEMENT(thd, "BAD"); - - Will result in a warning - - "'BAD' is deprecated and will be removed in a future release." - - Note that in macro arguments BAD is not quoted. -*/ - -#define WARN_DEPRECATED_NO_REPLACEMENT(Thd,Old) \ - do { \ - THD *thd_= ((THD*) Thd); \ - if (thd_ != NULL) \ - push_warning_printf(thd_, Sql_condition::WARN_LEVEL_WARN, \ - ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, \ - ER_THD(thd_, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), \ - (Old)); \ - else \ - sql_print_warning("'%s' is deprecated and will be removed " \ - "in a future release.", (Old)); \ - } while(0) - -/*************************************************************************/ - -#endif - /* This is included in the server and in the client. Options for select set by the yacc parser (stored in lex->options). diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index dc27ab9ff8b..1f03338ccce 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -3828,10 +3828,8 @@ bool change_master(THD* thd, Master_info* mi, bool *master_info_added) else if (lex_mi->use_gtid_opt == LEX_MASTER_INFO::LEX_GTID_CURRENT_POS) { mi->using_gtid= Master_info::USE_GTID_CURRENT_POS; - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX), - "master_use_gtid=current_pos", "master_demote_to_slave=1"); + warn_deprecated<1010>(thd, "master_use_gtid=current_pos", + "master_demote_to_slave=1"); } else if (lex_mi->use_gtid_opt == LEX_MASTER_INFO::LEX_GTID_NO || lex_mi->log_file_name || lex_mi->pos || diff --git a/sql/sql_type.cc b/sql/sql_type.cc index e0afd0dd73f..ac2ff437bab 100644 --- a/sql/sql_type.cc +++ b/sql/sql_type.cc @@ -2974,10 +2974,7 @@ void Type_handler_year:: { char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1]; my_snprintf(buff, sizeof(buff), "YEAR(%llu)", def->length); - push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, - ER_WARN_DEPRECATED_SYNTAX, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX), - buff, "YEAR(4)"); + warn_deprecated<1007>(thd, buff, "YEAR(4)"); } } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index af2ec678daa..143526c17fe 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6287,10 +6287,7 @@ field_type_temporal: { char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1]; my_snprintf(buff, sizeof(buff), "YEAR(%u)", (uint) $2.length()); - push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, - ER_WARN_DEPRECATED_SYNTAX, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX), - buff, "YEAR(4)"); + warn_deprecated<1007>(thd, buff, "YEAR(4)"); } } $$.set(&type_handler_year, $2); diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 03279e945a3..ebb64b340b0 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -736,10 +736,7 @@ static bool deprecated_explicit_defaults_for_timestamp(sys_var *self, THD *thd, set_var *var) { if (var->value && var->save_result.ulonglong_value == 0) - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), - "explicit_defaults_for_timestamp=0"); // since 11.0.0 + warn_deprecated<1100>(thd, "explicit_defaults_for_timestamp=0"); return false; } static Sys_var_bit Sys_explicit_defaults_for_timestamp( @@ -1455,7 +1452,7 @@ static Sys_var_uint Sys_large_page_size( READ_ONLY GLOBAL_VAR(opt_large_page_size), NO_CMD_LINE, VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("")); + DEPRECATED(1005, "")); static Sys_var_mybool Sys_large_pages( "large_pages", "Enable support for large pages", @@ -1544,7 +1541,7 @@ static Sys_var_bit Sys_log_slow_admin_statements( SESSION_VAR(log_slow_disabled_statements), CMD_LINE(OPT_ARG), REVERSE(LOG_SLOW_DISABLE_ADMIN), DEFAULT(TRUE), 0, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("'@@log_slow_filter'")); + DEPRECATED(1100, "'@@log_slow_filter'")); static Sys_var_bit Sys_log_slow_slave_statements( "log_slow_slave_statements", @@ -2755,7 +2752,7 @@ static bool set_old_mode (sys_var *self, THD *thd, enum_var_type type) static Sys_var_mybool Sys_old_mode( "old", "Use compatible behavior from previous MariaDB version. See also --old-mode", SESSION_VAR(old_mode), CMD_LINE(OPT_ARG), DEFAULT(FALSE), 0, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(set_old_mode), DEPRECATED("'@@old_mode'")); + ON_UPDATE(set_old_mode), DEPRECATED(1009, "'@@old_mode'")); static Sys_var_mybool Sys_opt_allow_suspicious_udfs( "allow_suspicious_udfs", @@ -3887,10 +3884,7 @@ void old_mode_deprecated_warnings(THD *thd, ulonglong v) if ((1ULL<(thd, old_mode_names[i]); else sql_print_warning("--old-mode='%s' is deprecated and will be " "removed in a future release", old_mode_names[i]); @@ -4233,7 +4227,7 @@ static Sys_var_tx_isolation Sys_tx_isolation( SESSION_VAR(tx_isolation), NO_CMD_LINE, tx_isolation_names, DEFAULT(ISO_REPEATABLE_READ), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_tx_isolation), - ON_UPDATE(0), DEPRECATED("'@@transaction_isolation'")); // since 11.1.0 + ON_UPDATE(0), DEPRECATED(1101, "'@@transaction_isolation'")); static Sys_var_tx_isolation Sys_transaction_isolation( "transaction_isolation", "Default transaction isolation level", @@ -4292,7 +4286,7 @@ static Sys_var_tx_read_only Sys_tx_read_only( "This variable is deprecated and will be removed in a future release.", SESSION_VAR(tx_read_only), NO_CMD_LINE, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_tx_read_only), - ON_UPDATE(0), DEPRECATED("'@@transaction_read_only'")); // since 11.1.0 + ON_UPDATE(0), DEPRECATED(1101, "'@@transaction_read_only'")); static Sys_var_tx_read_only Sys_transaction_read_only( "transaction_read_only", "Default transaction access mode. If set to OFF, " @@ -4421,7 +4415,7 @@ static Sys_var_plugin Sys_storage_engine( SESSION_VAR(table_plugin), NO_CMD_LINE, MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_storage_engine), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_not_null), ON_UPDATE(0), - DEPRECATED("'@@default_storage_engine'")); // since 10.5.1 + DEPRECATED(1005, "'@@default_storage_engine'")); static Sys_var_plugin Sys_default_tmp_storage_engine( "default_tmp_storage_engine", "The default storage engine for user-created temporary tables", @@ -4568,7 +4562,7 @@ static Sys_var_mybool Sys_big_tables( "longer needed, as the server now handles this automatically.", SESSION_VAR(big_tables), CMD_LINE(OPT_ARG), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("")); // since 10.5.0 + DEPRECATED(1005, "")); static Sys_var_bit Sys_big_selects( "sql_big_selects", "If set to 0, MariaDB will not perform large SELECTs." @@ -5038,7 +5032,7 @@ static Sys_var_mybool Sys_keep_files_on_create( SESSION_VAR(keep_files_on_create), CMD_LINE(OPT_ARG), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), - DEPRECATED("")); // since 10.8.0 + DEPRECATED(1008, "")); static char *license; static Sys_var_charptr Sys_license( @@ -6282,7 +6276,7 @@ static Sys_var_mybool Sys_wsrep_load_data_splitting( "transaction after every 10K rows inserted (deprecated)", GLOBAL_VAR(wsrep_load_data_splitting), CMD_LINE(OPT_ARG), DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(0), ON_UPDATE(0), DEPRECATED("")); // since 10.4.3 + ON_CHECK(0), ON_UPDATE(0), DEPRECATED(1004, "")); static Sys_var_mybool Sys_wsrep_slave_FK_checks( "wsrep_slave_FK_checks", "Should slave thread do " diff --git a/sql/sys_vars.inl b/sql/sys_vars.inl index 5d92e83c033..96127fccdae 100644 --- a/sql/sys_vars.inl +++ b/sql/sys_vars.inl @@ -69,7 +69,7 @@ @@foreign_key_checks <-> OPTION_NO_FOREIGN_KEY_CHECKS */ #define REVERSE(X) ~(X) -#define DEPRECATED(X) X +#define DEPRECATED(V, REPL) (check_deprecated_version(), REPL) #define session_var(THD, TYPE) (*(TYPE*)session_var_ptr(THD)) #define global_var(TYPE) (*(TYPE*)global_var_ptr()) diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc index 9bc4b3339dd..db8337c60f1 100644 --- a/storage/oqgraph/ha_oqgraph.cc +++ b/storage/oqgraph/ha_oqgraph.cc @@ -311,8 +311,7 @@ int ha_oqgraph::oqgraph_check_table_structure (TABLE *table_arg) DBUG_PRINT( "oq-debug", ("Allowing integer latch anyway!")); isStringLatch = false; /* Make a warning */ - push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), + warn_deprecated<1004>(current_thd, "latch SMALLINT UNSIGNED NULL", "'latch VARCHAR(32) NULL'"); } else #endif diff --git a/storage/perfschema/table_setup_timers.cc b/storage/perfschema/table_setup_timers.cc index 3c6f8451030..92af0655cc0 100644 --- a/storage/perfschema/table_setup_timers.cc +++ b/storage/perfschema/table_setup_timers.cc @@ -87,12 +87,7 @@ table_setup_timers::m_share= PFS_engine_table* table_setup_timers::create(void) { - THD *thd = current_thd; - push_warning_printf(thd, - Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), - "performance_schema.setup_timers"); + warn_deprecated<1005>(current_thd, "performance_schema.setup_timers"); return new table_setup_timers(); } diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result index 4a1fc17395d..3010e220421 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result @@ -928,7 +928,7 @@ y2 YEAR(2) NOT NULL, pk DATETIME PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra d date NO NULL @@ -1170,7 +1170,7 @@ DROP TABLE IF EXISTS t1; #---------------------------------- CREATE TABLE t1 (pk INT AUTO_INCREMENT PRIMARY KEY, c YEAR(2) NOT NULL) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra pk int(11) NO PRI NULL auto_increment @@ -1190,7 +1190,7 @@ pk INT AUTO_INCREMENT PRIMARY KEY, c YEAR(2) NOT NULL DEFAULT '12' ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra pk int(11) NO PRI NULL auto_increment diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result index d97fb8a2481..14170e2a1b1 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result @@ -818,7 +818,7 @@ y2 YEAR(2) NULL, pk DATETIME PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra d date YES NULL @@ -1003,9 +1003,9 @@ c2 YEAR(2) NULL DEFAULT '12', pk INT AUTO_INCREMENT PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra c year(2) YES NULL diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result b/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result index 91e7ac257c3..5c00c0412aa 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_date_time.result @@ -12,7 +12,7 @@ y2 YEAR(2) , pk DATETIME PRIMARY KEY ) ENGINE=rocksdb; Warnings: -Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead +Warning 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead SHOW COLUMNS IN t1; Field Type Null Key Default Extra d date YES NULL diff --git a/storage/spider/mysql-test/spider/r/variable_deprecation.result b/storage/spider/mysql-test/spider/r/variable_deprecation.result index cea36ff2240..8ead5350726 100644 --- a/storage/spider/mysql-test/spider/r/variable_deprecation.result +++ b/storage/spider/mysql-test/spider/r/variable_deprecation.result @@ -22,10 +22,10 @@ Variable_name Value spider_internal_offset 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='ios "1"'; Warnings: -Warning 1287 The table parameter 'ios' is deprecated and will be removed in a future release +Warning 1287 'ios' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='internal_offset "1"'; Warnings: -Warning 1287 The table parameter 'internal_offset' is deprecated and will be removed in a future release +Warning 1287 'internal_offset' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; # MDEV-27981 Deprecate spider_internal_limit @@ -37,10 +37,10 @@ Variable_name Value spider_internal_limit 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='ilm "1"'; Warnings: -Warning 1287 The table parameter 'ilm' is deprecated and will be removed in a future release +Warning 1287 'ilm' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='internal_limit "1"'; Warnings: -Warning 1287 The table parameter 'internal_limit' is deprecated and will be removed in a future release +Warning 1287 'internal_limit' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; # MDEV-28244 Deprecate spider_xa_register_mode @@ -86,10 +86,10 @@ Variable_name Value spider_crd_mode 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='cmd "3"'; Warnings: -Warning 1287 The table parameter 'cmd' is deprecated and will be removed in a future release +Warning 1287 'cmd' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='crd_mode "3"'; Warnings: -Warning 1287 The table parameter 'crd_mode' is deprecated and will be removed in a future release +Warning 1287 'crd_mode' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; SET spider_sts_mode = 1; @@ -100,10 +100,10 @@ Variable_name Value spider_sts_mode 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='smd "3"'; Warnings: -Warning 1287 The table parameter 'smd' is deprecated and will be removed in a future release +Warning 1287 'smd' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='sts_mode "3"'; Warnings: -Warning 1287 The table parameter 'sts_mode' is deprecated and will be removed in a future release +Warning 1287 'sts_mode' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; # MDEV-28010 Deprecate spider_crd_type and spider_crd_weight @@ -115,10 +115,10 @@ Variable_name Value spider_crd_type 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='ctp "1"'; Warnings: -Warning 1287 The table parameter 'ctp' is deprecated and will be removed in a future release +Warning 1287 'ctp' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='crd_type "1"'; Warnings: -Warning 1287 The table parameter 'crd_type' is deprecated and will be removed in a future release +Warning 1287 'crd_type' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; SET spider_crd_weight = 1; @@ -129,10 +129,10 @@ Variable_name Value spider_crd_weight 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='cwg "1"'; Warnings: -Warning 1287 The table parameter 'cwg' is deprecated and will be removed in a future release +Warning 1287 'cwg' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='crd_weight "1"'; Warnings: -Warning 1287 The table parameter 'crd_weight' is deprecated and will be removed in a future release +Warning 1287 'crd_weight' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; # MDEV-28560 Deprecate spider_buffer_size @@ -144,10 +144,10 @@ Variable_name Value spider_buffer_size 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='bfz "1"'; Warnings: -Warning 1287 The table parameter 'bfz' is deprecated and will be removed in a future release +Warning 1287 'bfz' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='buffer_size "1"'; Warnings: -Warning 1287 The table parameter 'buffer_size' is deprecated and will be removed in a future release +Warning 1287 'buffer_size' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; # MDEV-27926 Deprecate spider_init_sql_alloc_size @@ -159,10 +159,10 @@ Variable_name Value spider_init_sql_alloc_size 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='isa "1"'; Warnings: -Warning 1287 The table parameter 'isa' is deprecated and will be removed in a future release +Warning 1287 'isa' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='init_sql_alloc_size "1"'; Warnings: -Warning 1287 The table parameter 'init_sql_alloc_size' is deprecated and will be removed in a future release +Warning 1287 'init_sql_alloc_size' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; # MDEV-28829 Deprecate spider_semi_table_lock and spider_semi_table_lock_connection @@ -174,10 +174,10 @@ Variable_name Value spider_semi_table_lock 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='stl "1"'; Warnings: -Warning 1287 The table parameter 'stl' is deprecated and will be removed in a future release +Warning 1287 'stl' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='semi_table_lock "1"'; Warnings: -Warning 1287 The table parameter 'semi_table_lock' is deprecated and will be removed in a future release +Warning 1287 'semi_table_lock' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; SET spider_semi_table_lock_connection = 0; @@ -188,10 +188,10 @@ Variable_name Value spider_semi_table_lock_connection 0 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='stc "0"'; Warnings: -Warning 1287 The table parameter 'stc' is deprecated and will be removed in a future release +Warning 1287 'stc' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='semi_table_lock_connection "0"'; Warnings: -Warning 1287 The table parameter 'semi_table_lock_connection' is deprecated and will be removed in a future release +Warning 1287 'semi_table_lock_connection' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; # MDEV-28795 Deprecate spider_bka_table_name_type @@ -203,10 +203,10 @@ Variable_name Value spider_bka_table_name_type 1 CREATE TABLE tbl_a (a INT) ENGINE=Spider COMMENT='btt "1"'; Warnings: -Warning 1287 The table parameter 'btt' is deprecated and will be removed in a future release +Warning 1287 'btt' is deprecated and will be removed in a future release CREATE TABLE tbl_b (a INT) ENGINE=Spider COMMENT='bka_table_name_type "1"'; Warnings: -Warning 1287 The table parameter 'bka_table_name_type' is deprecated and will be removed in a future release +Warning 1287 'bka_table_name_type' is deprecated and will be removed in a future release DROP TABLE tbl_a; DROP TABLE tbl_b; DROP DATABASE auto_test_local; diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index c54dcdea931..3851e27b22f 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -1985,16 +1985,9 @@ int st_spider_param_string_parse::print_param_error() } \ break; \ } -#define SPIDER_PARAM_DEPRECATED_WARNING(title_name) \ +#define SPIDER_PARAM_DEPRECATED_WARNING(title_name, VER) \ if (!strncasecmp(tmp_ptr, title_name, title_length) && create_table) \ - { \ - THD *thd= current_thd; \ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, \ - ER_WARN_DEPRECATED_SYNTAX, \ - "The table parameter '%s' is deprecated and will be " \ - "removed in a future release", \ - title_name); \ - } + warn_deprecated(current_thd, title_name) /* Set a given engine-defined option, which holds a string list, to the @@ -2239,7 +2232,7 @@ int spider_parse_connect_info( 2147483647); SPIDER_PARAM_INT_WITH_MAX("aim", auto_increment_mode, 0, 3); SPIDER_PARAM_INT("alc", active_link_count, 1); - SPIDER_PARAM_DEPRECATED_WARNING("bfz"); + SPIDER_PARAM_DEPRECATED_WARNING("bfz", 1007); SPIDER_PARAM_INT("bfz", buffer_size, 0); SPIDER_PARAM_LONGLONG("bfr", bgs_first_read, 0); SPIDER_PARAM_INT("bmd", bgs_mode, 0); @@ -2247,22 +2240,22 @@ int spider_parse_connect_info( SPIDER_PARAM_STR("bke", bka_engine); SPIDER_PARAM_INT_WITH_MAX("bkm", bka_mode, 0, 2); SPIDER_PARAM_INT("bsz", bulk_size, 0); - SPIDER_PARAM_DEPRECATED_WARNING("btt"); + SPIDER_PARAM_DEPRECATED_WARNING("btt", 1007); SPIDER_PARAM_LONG_LIST_WITH_MAX("btt", bka_table_name_types, 0, 1); SPIDER_PARAM_INT_WITH_MAX("bum", bulk_update_mode, 0, 2); SPIDER_PARAM_INT("bus", bulk_update_size, 0); SPIDER_PARAM_INT_WITH_MAX("cbm", crd_bg_mode, 0, 2); SPIDER_PARAM_DOUBLE("civ", crd_interval, 0); - SPIDER_PARAM_DEPRECATED_WARNING("cmd"); + SPIDER_PARAM_DEPRECATED_WARNING("cmd", 1007); SPIDER_PARAM_INT_WITH_MAX("cmd", crd_mode, 0, 3); SPIDER_PARAM_INT_WITH_MAX("csr", casual_read, 0, 63); SPIDER_PARAM_INT_WITH_MAX("csy", crd_sync, 0, 2); SPIDER_PARAM_LONG_LIST_WITH_MAX("cto", connect_timeouts, 0, 2147483647); - SPIDER_PARAM_DEPRECATED_WARNING("ctp"); + SPIDER_PARAM_DEPRECATED_WARNING("ctp", 1007); SPIDER_PARAM_INT_WITH_MAX("ctp", crd_type, 0, 2); - SPIDER_PARAM_DEPRECATED_WARNING("cwg"); + SPIDER_PARAM_DEPRECATED_WARNING("cwg", 1007); SPIDER_PARAM_DOUBLE("cwg", crd_weight, 1); SPIDER_PARAM_INT_WITH_MAX("dat", delete_all_rows_type, 0, 1); SPIDER_PARAM_INT_WITH_MAX("ddi", direct_dup_insert, 0, 1); @@ -2281,11 +2274,11 @@ int spider_parse_connect_info( #endif SPIDER_PARAM_STR_LIST("fds", tgt_filedsns); SPIDER_PARAM_LONGLONG("frd", first_read, 0); - SPIDER_PARAM_DEPRECATED_WARNING("isa"); + SPIDER_PARAM_DEPRECATED_WARNING("isa", 1007); SPIDER_PARAM_INT("isa", init_sql_alloc_size, 0); - SPIDER_PARAM_DEPRECATED_WARNING("ilm"); + SPIDER_PARAM_DEPRECATED_WARNING("ilm", 1007); SPIDER_PARAM_LONGLONG("ilm", internal_limit, 0); - SPIDER_PARAM_DEPRECATED_WARNING("ios"); + SPIDER_PARAM_DEPRECATED_WARNING("ios", 1007); SPIDER_PARAM_LONGLONG("ios", internal_offset, 0); SPIDER_PARAM_INT_WITH_MAX("iom", internal_optimize, 0, 1); SPIDER_PARAM_INT_WITH_MAX("iol", internal_optimize_local, 0, 1); @@ -2334,7 +2327,7 @@ int spider_parse_connect_info( SPIDER_PARAM_INT_WITH_MAX("slc", store_last_crd, 0, 1); SPIDER_PARAM_INT_WITH_MAX("slm", selupd_lock_mode, 0, 2); SPIDER_PARAM_INT_WITH_MAX("sls", store_last_sts, 0, 1); - SPIDER_PARAM_DEPRECATED_WARNING("smd"); + SPIDER_PARAM_DEPRECATED_WARNING("smd", 1007); SPIDER_PARAM_INT_WITH_MAX("smd", sts_mode, 1, 2); SPIDER_PARAM_LONGLONG("smr", static_mean_rec_length, 0); SPIDER_PARAM_LONGLONG("spr", split_read, 0); @@ -2348,9 +2341,9 @@ int spider_parse_connect_info( SPIDER_PARAM_DOUBLE("ssr", semi_split_read, 0); SPIDER_PARAM_LONGLONG("ssl", semi_split_read_limit, 0); SPIDER_PARAM_INT_WITH_MAX("ssy", sts_sync, 0, 2); - SPIDER_PARAM_DEPRECATED_WARNING("stc"); + SPIDER_PARAM_DEPRECATED_WARNING("stc", 1007); SPIDER_PARAM_INT_WITH_MAX("stc", semi_table_lock_conn, 0, 1); - SPIDER_PARAM_DEPRECATED_WARNING("stl"); + SPIDER_PARAM_DEPRECATED_WARNING("stl", 1007); SPIDER_PARAM_INT_WITH_MAX("stl", semi_table_lock, 0, 1); SPIDER_PARAM_LONGLONG("srs", static_records_for_status, 0); SPIDER_PARAM_LONG_LIST_WITH_MAX("svc", tgt_ssl_vscs, 0, 1); @@ -2399,13 +2392,13 @@ int spider_parse_connect_info( option_struct && option_struct->remote_database); SPIDER_PARAM_STR_LIST("password", tgt_passwords); - SPIDER_PARAM_DEPRECATED_WARNING("sts_mode"); + SPIDER_PARAM_DEPRECATED_WARNING("sts_mode", 1007); SPIDER_PARAM_INT_WITH_MAX("sts_mode", sts_mode, 1, 2); SPIDER_PARAM_INT_WITH_MAX("sts_sync", sts_sync, 0, 2); - SPIDER_PARAM_DEPRECATED_WARNING("crd_mode"); + SPIDER_PARAM_DEPRECATED_WARNING("crd_mode", 1007); SPIDER_PARAM_INT_WITH_MAX("crd_mode", crd_mode, 0, 3); SPIDER_PARAM_INT_WITH_MAX("crd_sync", crd_sync, 0, 2); - SPIDER_PARAM_DEPRECATED_WARNING("crd_type"); + SPIDER_PARAM_DEPRECATED_WARNING("crd_type", 1007); SPIDER_PARAM_INT_WITH_MAX("crd_type", crd_type, 0, 2); SPIDER_PARAM_LONGLONG("priority", priority, 0); SPIDER_PARAM_INT("bgs_mode", bgs_mode, 0); @@ -2421,7 +2414,7 @@ int spider_parse_connect_info( error_num = connect_string_parse.print_param_error(); goto error; case 10: - SPIDER_PARAM_DEPRECATED_WARNING("crd_weight"); + SPIDER_PARAM_DEPRECATED_WARNING("crd_weight", 1007); SPIDER_PARAM_DOUBLE("crd_weight", crd_weight, 1); SPIDER_PARAM_LONGLONG("split_read", split_read, 0); SPIDER_PARAM_INT_WITH_MAX("quick_mode", quick_mode, 0, 3); @@ -2437,7 +2430,7 @@ int spider_parse_connect_info( SPIDER_PARAM_INT_WITH_MAX("sts_bg_mode", sts_bg_mode, 0, 2); SPIDER_PARAM_LONG_LIST_WITH_MAX("link_status", link_statuses, 0, 3); SPIDER_PARAM_INT_WITH_MAX("casual_read", casual_read, 0, 63); - SPIDER_PARAM_DEPRECATED_WARNING("buffer_size"); + SPIDER_PARAM_DEPRECATED_WARNING("buffer_size", 1007); SPIDER_PARAM_INT("buffer_size", buffer_size, 0); error_num = connect_string_parse.print_param_error(); goto error; @@ -2454,7 +2447,7 @@ int spider_parse_connect_info( error_num = connect_string_parse.print_param_error(); goto error; case 14: - SPIDER_PARAM_DEPRECATED_WARNING("internal_limit"); + SPIDER_PARAM_DEPRECATED_WARNING("internal_limit", 1007); SPIDER_PARAM_LONGLONG("internal_limit", internal_limit, 0); SPIDER_PARAM_LONGLONG("bgs_first_read", bgs_first_read, 0); SPIDER_PARAM_INT_WITH_MAX("read_only_mode", read_only_mode, 0, 1); @@ -2466,10 +2459,10 @@ int spider_parse_connect_info( error_num = connect_string_parse.print_param_error(); goto error; case 15: - SPIDER_PARAM_DEPRECATED_WARNING("internal_offset"); + SPIDER_PARAM_DEPRECATED_WARNING("internal_offset", 1007); SPIDER_PARAM_LONGLONG("internal_offset", internal_offset, 0); SPIDER_PARAM_INT_WITH_MAX("reset_sql_alloc", reset_sql_alloc, 0, 1); - SPIDER_PARAM_DEPRECATED_WARNING("semi_table_lock"); + SPIDER_PARAM_DEPRECATED_WARNING("semi_table_lock", 1007); SPIDER_PARAM_INT_WITH_MAX("semi_table_lock", semi_table_lock, 0, 1); SPIDER_PARAM_LONGLONG("quick_page_byte", quick_page_byte, 0); SPIDER_PARAM_LONGLONG("quick_page_size", quick_page_size, 0); @@ -2538,11 +2531,11 @@ int spider_parse_connect_info( error_num = connect_string_parse.print_param_error(); goto error; case 19: - SPIDER_PARAM_DEPRECATED_WARNING("init_sql_alloc_size"); + SPIDER_PARAM_DEPRECATED_WARNING("init_sql_alloc_size", 1007); SPIDER_PARAM_INT("init_sql_alloc_size", init_sql_alloc_size, 0); SPIDER_PARAM_INT_WITH_MAX( "auto_increment_mode", auto_increment_mode, 0, 3); - SPIDER_PARAM_DEPRECATED_WARNING("bka_table_name_type"); + SPIDER_PARAM_DEPRECATED_WARNING("bka_table_name_type", 1007); SPIDER_PARAM_LONG_LIST_WITH_MAX("bka_table_name_type", bka_table_name_types, 0, 1); SPIDER_PARAM_INT_WITH_MAX( @@ -2589,7 +2582,7 @@ int spider_parse_connect_info( error_num = connect_string_parse.print_param_error(); goto error; case 26: - SPIDER_PARAM_DEPRECATED_WARNING("semi_table_lock_connection"); + SPIDER_PARAM_DEPRECATED_WARNING("semi_table_lock_connection", 1007); SPIDER_PARAM_INT_WITH_MAX( "semi_table_lock_connection", semi_table_lock_conn, 0, 1); error_num = connect_string_parse.print_param_error();