fix incorrect merge 15700f5

error messages in 11.8 should have same numbers as in 11.4

Author: vuvova

mysql-test/main/ctype_gbk.result

@@ -681,10 +681,10 @@ INSERT INTO t1 VALUES
 (REPEAT(0x1125,200000), REPEAT(0x1125,200000)), ('', ''), ('', '');
 SELECT a FROM t1 GROUP BY 1 LIMIT 1 INTO @nullll;
 Warnings:
-Warning	4203	1 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	1 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 SELECT b FROM t1 GROUP BY 1 LIMIT 1 INTO @nullll;
 Warnings:
-Warning	4203	1 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	1 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 DROP TABLES t1;
 End of 5.0 tests
 #

mysql-test/main/group_by.result

@@ -1919,7 +1919,7 @@ SELECT SUBSTRING(a,1,10), LENGTH(a), GROUP_CONCAT(b) FROM t1 GROUP BY a;
 SUBSTRING(a,1,10)	LENGTH(a)	GROUP_CONCAT(b)
 1111111111	1300	one,two
 Warnings:
-Warning	4203	2 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	2 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 EXPLAIN 
 SELECT SUBSTRING(a,1,10), LENGTH(a) FROM t1 GROUP BY a;
 id	1
@@ -1936,7 +1936,7 @@ SELECT SUBSTRING(a,1,10), LENGTH(a) FROM t1 GROUP BY a;
 SUBSTRING(a,1,10)	LENGTH(a)
 1111111111	1300
 Warnings:
-Warning	4203	1 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	1 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 DROP TABLE t1;
 #
 # Bug#57688 Assertion `!table || (!table->write_set || bitmap_is_set(table->write_set, field
@@ -2733,7 +2733,7 @@ f1	f2
 	NULL
 NULL	NULL
 Warnings:
-Warning	4203	116 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	116 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 SET @@sort_buffer_size = @old_sort_buff_size;
 DROP TABLE t1;
 #

mysql-test/main/mysql_tzinfo_to_sql_symlink.result

@@ -105,9 +105,9 @@ execute immediate if(@wsrep_cannot_replicate_tz, concat('ALTER TABLE time_zone_t
 execute immediate if(@wsrep_cannot_replicate_tz, concat('ALTER TABLE time_zone_transition_type ENGINE=', @time_zone_transition_type_engine, ', ORDER BY Time_zone_id, Transition_type_id'), 'do 0');
 SET session alter_algorithm=@old_alter_alg;
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 SELECT COUNT(*) FROM time_zone;
 COUNT(*)
 2
@@ -166,9 +166,9 @@ SET SESSION SQL_LOG_BIN=@save_sql_log_bin;
 execute immediate if(@wsrep_is_on, 'SET SESSION WSREP_ON=@save_wsrep_on', 'do 0');
 SET session alter_algorithm=@old_alter_alg;
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 SELECT COUNT(*) FROM time_zone;
 COUNT(*)
 2
@@ -490,9 +490,9 @@ execute immediate if(@wsrep_is_on, 'SET SESSION WSREP_ON=@save_wsrep_on', 'do 0'
 #
 set sql_mode=only_full_group_by;
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 SELECT COUNT(*) FROM time_zone;
 COUNT(*)
 2

mysql-test/main/order_by.result

@@ -860,7 +860,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxab
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaa
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz
 Warnings:
-Warning	4203	2 values were longer than max_sort_length. Sorting used only the first 64 bytes
+Warning	4202	2 values were longer than max_sort_length. Sorting used only the first 64 bytes
 drop table t1;
 create table t1 (
 `sid` decimal(8,0) default null,
@@ -4125,7 +4125,7 @@ a	substr(b, @save_max_sort_length+1)
 2	AB
 1	A
 Warnings:
-Warning	4203	5 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	5 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 analyze format=json
 select a, substr(b, @save_max_sort_length+1) from t1 order by b desc;
 ANALYZE
@@ -4172,7 +4172,7 @@ ANALYZE
   }
 }
 Warnings:
-Warning	4203	5 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	5 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 drop table t1;
 #
 # Packing sort keys with complex collations

mysql-test/main/query_cache.result

@@ -831,7 +831,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxw
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxy
 Warnings:
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 64 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 64 bytes
 set max_sort_length=200;
 select c from t1 order by c, id;
 c

mysql-test/main/repair.result

@@ -287,16 +287,16 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 GLOBAL_VALUE_PATH	NULL
 set alter_algorithm=COPY;
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 select @@alter_algorithm;
 @@alter_algorithm
 DEFAULT
 set statement alter_algorithm=COPY FOR SELECT @@alter_algorithm;
 @@alter_algorithm
 DEFAULT
 Warnings:
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
-Warning	4201	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 # restart: --alter-algorithm=COPY
 select @@alter_algorithm;
 @@alter_algorithm

mysql-test/main/secondary_key_costs.result

@@ -29,8 +29,8 @@ explain select * from t1  where nm like '500%' AND fl2 = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	idx1,idx2	idx1	35	NULL	1	Using index condition; Using where
 Warnings:
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 set @trace=(select trace from information_schema.optimizer_trace);
 select json_detailed(json_extract(@trace, '$**.considered_access_paths'));
 json_detailed(json_extract(@trace, '$**.considered_access_paths'))
@@ -97,8 +97,8 @@ explain select * from t1  where nm like '500%' AND fl2 = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	idx1,idx2	idx1	35	NULL	1	Using index condition; Using where
 Warnings:
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 set @trace=(select trace from information_schema.optimizer_trace);
 select json_detailed(json_extract(@trace, '$**.considered_access_paths'));
 json_detailed(json_extract(@trace, '$**.considered_access_paths'))
@@ -163,14 +163,14 @@ select @@optimizer_adjust_secondary_key_costs;
 0
 set @@optimizer_adjust_secondary_key_costs=7;
 Warnings:
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warning	1292	Truncated incorrect optimizer_adjust_secondary_ke... value: '7'
 select @@optimizer_adjust_secondary_key_costs;
 @@optimizer_adjust_secondary_key_costs
 2
 set @@optimizer_adjust_secondary_key_costs=default;
 Warnings:
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 #
 # MDEV-34664: fix_innodb_cardinality
 #
@@ -201,7 +201,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	b	b	5	test.t2.a	90	Using index
 set @@optimizer_adjust_secondary_key_costs=8;
 Warnings:
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warning	1292	Truncated incorrect optimizer_adjust_secondary_ke... value: '8'
 explain select * from t1,t2 where t1.b=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -238,4 +238,4 @@ set global userstat=@save_userstat;
 set global innodb_stats_persistent_sample_pages=@save_ispsp;
 set @@optimizer_adjust_secondary_key_costs=default;
 Warnings:
-Warning	4201	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The variable '@@optimizer_adjust_secondary_key_costs' is ignored. It only exists for compatibility with old installations and will be removed in a future release

mysql-test/main/subselect_mat.result

@@ -899,7 +899,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 set @@group_concat_max_len = 256;
 explain extended select left(a1,7), left(a2,7)
 from t1_1024
@@ -917,7 +917,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 drop table t1_1024, t2_1024, t3_1024;
 set @blob_len = 1025;
 set @suffix_len = @blob_len - @prefix_len;
@@ -1002,7 +1002,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 set @@group_concat_max_len = 256;
 explain extended select left(a1,7), left(a2,7)
 from t1_1025
@@ -1020,7 +1020,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 drop table t1_1025, t2_1025, t3_1025;
 create table t1bit (a1 bit(3), a2 bit(3));
 create table t2bit (b1 bit(3), b2 bit(3));

mysql-test/main/subselect_sj_mat.result

@@ -919,7 +919,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 set @@group_concat_max_len = 256;
 explain extended select left(a1,7), left(a2,7)
 from t1_1024
@@ -938,7 +938,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 drop table t1_1024, t2_1024, t3_1024;
 set @blob_len = 1025;
 set @suffix_len = @blob_len - @prefix_len;
@@ -1024,7 +1024,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 set @@group_concat_max_len = 256;
 explain extended select left(a1,7), left(a2,7)
 from t1_1025
@@ -1043,7 +1043,7 @@ Warnings:
 Warning	1260	Row 1 was cut by group_concat()
 Warning	1260	Row 2 was cut by group_concat()
 Warning	1260	Row 3 was cut by group_concat()
-Warning	4203	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
+Warning	4202	3 values were longer than max_sort_length. Sorting used only the first 1024 bytes
 drop table t1_1025, t2_1025, t3_1025;
 create table t1bit (a1 bit(3), a2 bit(3));
 create table t2bit (b1 bit(3), b2 bit(3));

mysql-test/main/vector_funcs.result

@@ -13,7 +13,7 @@ select vec_totext(x'aabbcc');
 vec_totext(x'aabbcc')
 NULL
 Warnings:
-Warning	4204	Invalid binary vector format. Must use IEEE standard float representation in little-endian format. Use VEC_FromText() to generate it.
+Warning	4203	Invalid binary vector format. Must use IEEE standard float representation in little-endian format. Use VEC_FromText() to generate it.
 select vec_totext(x'0000f07f');
 vec_totext(x'0000f07f')
 [NaN]
@@ -30,60 +30,60 @@ select hex(vec_fromtext('["a"]'));
 hex(vec_fromtext('["a"]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 4 for '["a"]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 4 for '["a"]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[]'));
 hex(vec_fromtext('[]'))
 
 select hex(vec_fromtext('["a"]'));
 hex(vec_fromtext('["a"]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 4 for '["a"]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 4 for '["a"]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[{"a": "b"}]'));
 hex(vec_fromtext('[{"a": "b"}]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 2 for '[{"a": "b"}]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 2 for '[{"a": "b"}]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[null]'));
 hex(vec_fromtext('[null]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 5 for '[null]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 5 for '[null]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[1, null]'));
 hex(vec_fromtext('[1, null]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 8 for '[1, null]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 8 for '[1, null]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[1, ["a"]]'));
 hex(vec_fromtext('[1, ["a"]]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 5 for '[1, ["a"]]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 5 for '[1, ["a"]]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[1, [2]]'));
 hex(vec_fromtext('[1, [2]]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 5 for '[1, [2]]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 5 for '[1, [2]]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('{"a":"b"}'));
 hex(vec_fromtext('{"a":"b"}'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 1 for '{"a":"b"}'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 1 for '{"a":"b"}'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[1, 2, "z", 3]'));
 hex(vec_fromtext('[1, 2, "z", 3]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 10 for '[1, 2, "z", 3]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 10 for '[1, 2, "z", 3]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[1, 2, 3'));
 hex(vec_fromtext('[1, 2, 3'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 8 for '[1, 2, 3'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 8 for '[1, 2, 3'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('1, 2, 3]'));
 hex(vec_fromtext('1, 2, 3]'))
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 1 for '1, 2, 3]'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 1 for '1, 2, 3]'. Must be a valid JSON array of numbers.
 select hex(vec_fromtext('[]'));
 hex(vec_fromtext('[]'))
 
@@ -141,7 +141,7 @@ select vec_fromtext(v) from t;
 vec_fromtext(v)
 NULL
 Warnings:
-Warning	4205	Invalid vector format at offset: 1 for '{\0014n?'. Must be a valid JSON array of numbers.
+Warning	4204	Invalid vector format at offset: 1 for '{\0014n?'. Must be a valid JSON array of numbers.
 drop table t;
 select vec_fromtext(0x00000000);
 vec_fromtext(0x00000000)