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

@@ -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;

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;

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;

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;

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;

mysql-test/main/func_des_encrypt.result

@@ -2,7 +2,7 @@ select des_encrypt('hello');
 des_encrypt('hello')
 <EFBFBD><EFBFBD>2nV<6E><56>}
 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
+Warning	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
-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	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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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	<09>
 1	<09>
 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
-#

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 #

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
+Warning	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
-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(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
+Warning	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_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
+Warning	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_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
+Warning	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
-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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_decrypt' is deprecated and will be removed in a future release
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

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
+Warning	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_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
+Warning	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
-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_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
+Warning	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_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
+Warning	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_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
+Warning	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
-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
 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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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
+Warning	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_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

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'

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"),

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)

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;

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` (

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

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
+Warning	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
 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	

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;

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

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
+Warning	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
 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
+Warning	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
 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);

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
+Warning	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
 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
+Warning	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
 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
+Warning	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
 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
+Warning	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
 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');

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
+Warning	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
 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
+Warning	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
 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);

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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt'
 into table tb2;
 USE test;

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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt'
 into table tb2;
 USE test;

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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt'
 into table tb2 ;
 USE test;

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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
 into table tb2;
 USE test;

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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
 into table tb2;
 USE test;

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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt'
 into table tb2 ;
 USE test;

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 '<MYSQLTEST_VARDIR>/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 '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
 into table tb2;
 USE test;

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

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;

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,

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
 #

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;

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
 #

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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');

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;

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;

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;

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

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;

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

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");

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;

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;

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

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;

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;

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;

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;

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

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

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<uint V> 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<uint V> static inline void warn_deprecated(THD *thd,
+                                      const char *what, const char *to= NULL)
+{
+  check_deprecated_version<V>();
+  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

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,
+  warn_deprecated<1004>(thd,
-                      ER_WARN_DEPRECATED_SYNTAX,
-                      ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX),
                       "<data type> <character set clause> ... COMPRESSED...",
                       "'<data type> COMPRESSED... <character set clause> ...'");
   return set_compressed(method);

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,
+  warn_deprecated<1010>(thd, func_name_cstring().str);
-                      ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                      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,
+  warn_deprecated<1010>(thd, func_name_cstring().str);
-                      ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                      func_name_cstring().str);
   return FALSE;
 }
 

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);
-
+    warn_deprecated<999999>(thd, buf1, deprecation_substitute);
-    /* 
-       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);
   }
 }