From 805e7ca3adef50e17889ea17a1b86da6c3fb8580 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 17 Apr 2025 16:29:07 +0200 Subject: [PATCH] fix incorrect merge 15700f54c212 error messages in 11.8 should have same numbers as in 11.4 --- mysql-test/main/ctype_gbk.result | 4 +- mysql-test/main/group_by.result | 6 +- .../main/mysql_tzinfo_to_sql_symlink.result | 12 ++-- mysql-test/main/order_by.result | 6 +- mysql-test/main/query_cache.result | 2 +- mysql-test/main/repair.result | 6 +- mysql-test/main/secondary_key_costs.result | 16 ++--- mysql-test/main/subselect_mat.result | 8 +-- mysql-test/main/subselect_sj_mat.result | 8 +-- mysql-test/main/vector_funcs.result | 26 ++++---- .../r/prefix_index_liftedlimit.result | 2 +- mysql-test/suite/rpl/r/rpl_xa.result | 2 +- .../rpl/r/rpl_xa_gtid_pos_auto_engine.result | 2 +- .../sys_vars/r/alter_algorithm_basic.result | 4 +- ...purge_rseg_truncate_frequency_basic.result | 22 +++---- .../sys_vars/r/max_sort_length_func.result | 60 +++++++++---------- mysql-test/suite/vcol/r/partition.result | 2 +- mysql-test/suite/versioning/r/update.result | 4 +- sql/share/errmsg-utf8.txt | 6 +- 19 files changed, 99 insertions(+), 99 deletions(-) diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result index 79910f322c8..8ac9ac7bc45 100644 --- a/mysql-test/main/ctype_gbk.result +++ b/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 # diff --git a/mysql-test/main/group_by.result b/mysql-test/main/group_by.result index 2c4398fda59..33ef5e0aefb 100644 --- a/mysql-test/main/group_by.result +++ b/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; # diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.result b/mysql-test/main/mysql_tzinfo_to_sql_symlink.result index c0799920b90..69b75389679 100644 --- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.result +++ b/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 diff --git a/mysql-test/main/order_by.result b/mysql-test/main/order_by.result index 3f2d5ad9c4f..c8568dcd368 100644 --- a/mysql-test/main/order_by.result +++ b/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 diff --git a/mysql-test/main/query_cache.result b/mysql-test/main/query_cache.result index 9558f2e2274..1021fb4d6f1 100644 --- a/mysql-test/main/query_cache.result +++ b/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 diff --git a/mysql-test/main/repair.result b/mysql-test/main/repair.result index db46957e720..bbccf67f54e 100644 --- a/mysql-test/main/repair.result +++ b/mysql-test/main/repair.result @@ -287,7 +287,7 @@ 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 @@ -295,8 +295,8 @@ 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 diff --git a/mysql-test/main/secondary_key_costs.result b/mysql-test/main/secondary_key_costs.result index 946a3ebc843..a58d2f36b7a 100644 --- a/mysql-test/main/secondary_key_costs.result +++ b/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 diff --git a/mysql-test/main/subselect_mat.result b/mysql-test/main/subselect_mat.result index ba84b11d6eb..6e0a43cd6aa 100644 --- a/mysql-test/main/subselect_mat.result +++ b/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)); diff --git a/mysql-test/main/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result index 9b8bbc1451b..9d4f0564a12 100644 --- a/mysql-test/main/subselect_sj_mat.result +++ b/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)); diff --git a/mysql-test/main/vector_funcs.result b/mysql-test/main/vector_funcs.result index 4aae3297cdd..171bb6c7433 100644 --- a/mysql-test/main/vector_funcs.result +++ b/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,7 +30,7 @@ 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('[]')) @@ -38,52 +38,52 @@ 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) diff --git a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result index a62651cab3d..671efede18b 100644 --- a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result +++ b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result @@ -768,7 +768,7 @@ col_1_text = REPEAT("क", 4000) 1 0 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 DROP TABLE worklog5743; CREATE TABLE worklog5743 ( col_1_text TEXT(4000) , col_2_text TEXT(4000) , diff --git a/mysql-test/suite/rpl/r/rpl_xa.result b/mysql-test/suite/rpl/r/rpl_xa.result index 2841896bee0..5ed7ab5e279 100644 --- a/mysql-test/suite/rpl/r/rpl_xa.result +++ b/mysql-test/suite/rpl/r/rpl_xa.result @@ -30,7 +30,7 @@ insert into t2 values (0); xa end 's'; xa prepare 's'; Warnings: -Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten +Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten include/save_master_gtid.inc connection slave; include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result b/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result index 762f9c3c3aa..f10e3e578bd 100644 --- a/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result +++ b/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result @@ -36,7 +36,7 @@ insert into t2 values (0); xa end 's'; xa prepare 's'; Warnings: -Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten +Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten include/save_master_gtid.inc connection slave; include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/sys_vars/r/alter_algorithm_basic.result b/mysql-test/suite/sys_vars/r/alter_algorithm_basic.result index 767cc960688..042f897d8ec 100644 --- a/mysql-test/suite/sys_vars/r/alter_algorithm_basic.result +++ b/mysql-test/suite/sys_vars/r/alter_algorithm_basic.result @@ -4,7 +4,7 @@ SELECT @@global.alter_algorithm; DEFAULT SET GLOBAL alter_algorithm=2; 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 @@global.alter_algorithm; @@global.alter_algorithm DEFAULT @@ -15,7 +15,7 @@ SELECT @@global.alter_algorithm; DEFAULT SET SESSION alter_algorithm=INSTANT; 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 SHOW SESSION VARIABLES LIKE 'alter_algorithm'; Variable_name Value alter_algorithm DEFAULT diff --git a/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result b/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result index 913b06ae558..82972ab2d98 100644 --- a/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result @@ -5,10 +5,10 @@ SELECT @global_start_value; '#--------------------FN_DYNVARS_046_01------------------------#' SET @@global.innodb_purge_rseg_truncate_frequency = 1; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SET @@global.innodb_purge_rseg_truncate_frequency = DEFAULT; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 128 @@ -22,40 +22,40 @@ SELECT local.innodb_purge_rseg_truncate_frequency; ERROR 42S02: Unknown table 'local' in SELECT SET global innodb_purge_rseg_truncate_frequency = 1; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 '#--------------------FN_DYNVARS_046_03------------------------#' SET @@global.innodb_purge_rseg_truncate_frequency = 1; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 SET @@global.innodb_purge_rseg_truncate_frequency = 1; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 SET @@global.innodb_purge_rseg_truncate_frequency = 128; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 128 '#--------------------FN_DYNVARS_046_05-------------------------#' SET @@global.innodb_purge_rseg_truncate_frequency = -1; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_fr... value: '-1' SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 SET @@global.innodb_purge_rseg_truncate_frequency = -1024; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_fr... value: '-1024' SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency @@ -113,20 +113,20 @@ SELECT @@global.innodb_purge_rseg_truncate_frequency; '#---------------------FN_DYNVARS_046_08----------------------#' SET @@global.innodb_purge_rseg_truncate_frequency = TRUE; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 SET @@global.innodb_purge_rseg_truncate_frequency = FALSE; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_fr... value: '0' SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 SET @@global.innodb_purge_rseg_truncate_frequency = @global_start_value; Warnings: -Warning 4201 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release +Warning 4200 The variable '@@innodb_purge_rseg_truncate_frequency' is ignored. It only exists for compatibility with old installations and will be removed in a future release SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 128 diff --git a/mysql-test/suite/sys_vars/r/max_sort_length_func.result b/mysql-test/suite/sys_vars/r/max_sort_length_func.result index c4e5d98eb24..8e18831c13b 100644 --- a/mysql-test/suite/sys_vars/r/max_sort_length_func.result +++ b/mysql-test/suite/sys_vars/r/max_sort_length_func.result @@ -40,7 +40,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsy xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Warnings: -Warning 4203 6 values were longer than max_sort_length. Sorting used only the first 69 bytes +Warning 4202 6 values were longer than max_sort_length. Sorting used only the first 69 bytes ** Results should be sorted ** '#--------------------FN_DYNVARS_098_02-------------------------#' connect test_con2,localhost,root,,; @@ -94,7 +94,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxrx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsy xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgw Warnings: -Warning 4203 16 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 16 values were longer than max_sort_length. Sorting used only the first 64 bytes ** Results should not be sorted ** '#--------------------FN_DYNVARS_098_03-------------------------#' SET max_sort_length=64; @@ -125,7 +125,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxrx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsy xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgw Warnings: -Warning 4203 20 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 20 values were longer than max_sort_length. Sorting used only the first 64 bytes ** Results should not be sorted ** RESET QUERY CACHE; '#--------------------FN_DYNVARS_098_04-------------------------#' @@ -153,7 +153,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Warnings: -Warning 4203 15 values were longer than max_sort_length. Sorting used only the first 69 bytes +Warning 4202 15 values were longer than max_sort_length. Sorting used only the first 69 bytes ** Results should be sorted ** '#--------------------FN_DYNVARS_098_05-------------------------#' SET max_sort_length=70; @@ -225,7 +225,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgw xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsy xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxrx Warnings: -Warning 4203 4 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 4 values were longer than max_sort_length. Sorting used only the first 70 bytes ** Results should be sorted ** SET @@session.max_sort_length = 64; SELECT @@session.max_sort_length; @@ -246,7 +246,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxrx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsy xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgw Warnings: -Warning 4203 8 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 8 values were longer than max_sort_length. Sorting used only the first 64 bytes ** Results should not be sorted ** '#--------------------FN_DYNVARS_098_08-------------------------#' Testing type CHAR @@ -265,7 +265,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxrx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsy xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgw Warnings: -Warning 4203 4 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 4 values were longer than max_sort_length. Sorting used only the first 64 bytes ** Results should not be sorted ** SET @@session.max_sort_length = 64; SELECT @@session.max_sort_length; @@ -286,7 +286,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxrx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsy xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgw Warnings: -Warning 4203 8 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 8 values were longer than max_sort_length. Sorting used only the first 64 bytes ** Results should not be sorted ** DROP TABLE t, t1, t2; # @@ -308,7 +308,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx Warnings: -Warning 4203 3 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 3 values were longer than max_sort_length. Sorting used only the first 70 bytes # Make sure there are warnings when a string function is used: select a from t1 order by coalesce(a); a @@ -318,7 +318,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx Warnings: -Warning 4203 3 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 3 values were longer than max_sort_length. Sorting used only the first 70 bytes select a from t1 order by concat(a, '1'); a ShortStr1 @@ -327,7 +327,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx Warnings: -Warning 4203 3 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 3 values were longer than max_sort_length. Sorting used only the first 70 bytes select a from t1 order by binary(a); a ShortStr1 @@ -336,7 +336,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx Warnings: -Warning 4203 3 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 3 values were longer than max_sort_length. Sorting used only the first 70 bytes # Table having a variable-length string field and UTF16 encoding (2 bytes per char): create table t2(a varchar(100)) character set 'utf16'; insert into t2 values @@ -353,7 +353,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx 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 # Table having text blobs create table t3(a text, b mediumtext, c longtext) character set 'utf16'; insert into t3 values @@ -370,7 +370,7 @@ TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText888 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium88 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong88 TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText777 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium77 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong77 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 select * from t3 order by b desc; a b c shortString51 short777 short897 @@ -379,7 +379,7 @@ TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText888 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium88 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong88 TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText777 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium77 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong77 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 select * from t3 order by coalesce(b) desc; a b c shortString51 short777 short897 @@ -388,7 +388,7 @@ TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText888 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium88 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong88 TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText777 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium77 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong77 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 select * from t3 order by c; a b c TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText999 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium99 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong99 @@ -397,7 +397,7 @@ TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText shortString89 short123 short456 shortString51 short777 short897 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 select * from t3 order by c, a desc; a b c TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText999 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium99 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong99 @@ -406,7 +406,7 @@ TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText shortString89 short123 short456 shortString51 short777 short897 Warnings: -Warning 4203 6 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 6 values were longer than max_sort_length. Sorting used only the first 64 bytes # Packing of sort keys will be applied here: select * from t3 order by a, c, b; a b c @@ -416,7 +416,7 @@ TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText888 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium88 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong88 TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText777 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium77 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong77 Warnings: -Warning 4203 9 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 9 values were longer than max_sort_length. Sorting used only the first 64 bytes select * from t3 order by a; a b c shortString51 short777 short897 @@ -425,7 +425,7 @@ TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText888 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium88 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong88 TextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextTextText777 MediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMediumMedium77 LongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLongLong77 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 # Test a prepared statement re-execution (expecting warnings at both executions) prepare stmt from "select * from t2 order by a"; execute stmt; @@ -436,7 +436,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx 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 execute stmt; a shortString51 @@ -445,7 +445,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx 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 # Test a stored procedure create procedure p1() select * from t2 order by a; call p1(); @@ -456,7 +456,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx 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 call p1(); a shortString51 @@ -465,7 +465,7 @@ StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrzzz StrStrStrStrStrStrStrStrStrStrStrStrStrStrStryyy StrStrStrStrStrStrStrStrStrStrStrStrStrStrStrxxx 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 drop procedure p1; # Test a stored function create function f1 () returns char(100) return (select a from t1 order by a limit 1); @@ -477,7 +477,7 @@ ShortStr1 ShortStr1 ShortStr1 Warnings: -Warning 4203 15 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 15 values were longer than max_sort_length. Sorting used only the first 64 bytes # Test a view create view v1 as select f1() as f1_res from t1 order by f1_res; select * from v1; @@ -488,7 +488,7 @@ ShortStr1 ShortStr1 ShortStr1 Warnings: -Warning 4203 30 values were longer than max_sort_length. Sorting used only the first 64 bytes +Warning 4202 30 values were longer than max_sort_length. Sorting used only the first 64 bytes drop function f1; drop view v1; drop table t1, t2, t3; @@ -501,13 +501,13 @@ create table t1 (a int, b varchar(1024)); insert into t1 values (1,repeat('x',513)), (2,repeat('y',650)); insert into t1 select * from t1 order by b limit 1; Warnings: -Warning 4203 2 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 2 values were longer than max_sort_length. Sorting used only the first 70 bytes update t1 set a = 3 order by b limit 1; Warnings: -Warning 4203 3 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 3 values were longer than max_sort_length. Sorting used only the first 70 bytes delete from t1 where a < 3 order by b; Warnings: -Warning 4203 2 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 2 values were longer than max_sort_length. Sorting used only the first 70 bytes # Make sure warnings from previous statements do not overflow to next ones select a from t1; a @@ -521,7 +521,7 @@ create table t1 (a varchar(1024)) engine=innodb; insert into t1 values (repeat('a',1000)),(repeat('b',1000)); insert into t1 (a) select a from t1 order by a; Warnings: -Warning 4203 2 values were longer than max_sort_length. Sorting used only the first 70 bytes +Warning 4202 2 values were longer than max_sort_length. Sorting used only the first 70 bytes drop table t1; connection default; disconnect test_con1; diff --git a/mysql-test/suite/vcol/r/partition.result b/mysql-test/suite/vcol/r/partition.result index 31e36edc1ec..8cc13a85da1 100644 --- a/mysql-test/suite/vcol/r/partition.result +++ b/mysql-test/suite/vcol/r/partition.result @@ -92,7 +92,7 @@ x left(b, 10) left(v, 10) 50 zzzzzzzzzz zzzzzzzzzz 56 zzzzzzzzzz zzzzzzzzzz Warnings: -Warning 4203 29 values were longer than max_sort_length. Sorting used only the first 1024 bytes +Warning 4202 29 values were longer than max_sort_length. Sorting used only the first 1024 bytes update t1 set b= 'bar' where v > 'a' limit 20; drop table t1; # Cover return_top_record() in ha_partition::handle_ordered_index_scan() diff --git a/mysql-test/suite/versioning/r/update.result b/mysql-test/suite/versioning/r/update.result index 76d55531a69..62150eeb4bc 100644 --- a/mysql-test/suite/versioning/r/update.result +++ b/mysql-test/suite/versioning/r/update.result @@ -258,7 +258,7 @@ x left(y, 4) length(y) check_row(row_start, row_end) 1 LONG 8192 HISTORICAL ROW 2 LONG 8192 CURRENT ROW 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 update t1 set y= 'SHORT'; select x, left(y, 4), length(y), check_row(row_start, row_end) from t1 for system_time all order by x, y; x left(y, 4) length(y) check_row(row_start, row_end) @@ -266,7 +266,7 @@ x left(y, 4) length(y) check_row(row_start, row_end) 2 LONG 8192 HISTORICAL ROW 2 SHOR 5 CURRENT ROW 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 drop tables t1; ### Issue tempesta-tech/mariadb#365, bug 7 (duplicate of historical row) create or replace table t1 (a int primary key, b int) diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index d18e805790b..1c27ea7c68e 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -12266,8 +12266,6 @@ ER_JSON_SCHEMA_KEYWORD_UNSUPPORTED sw "%s neno kuu halitumiki" ER_JSON_NO_VARIABLE_SCHEMA eng "Variable schema is not supported." -ER_PSEUDO_THREAD_ID_OVERWRITE - eng "Pseudo thread id should not be modified by the client as it will be overwritten" ER_SEQUENCE_TABLE_HAS_WRONG_NUMBER_OF_COLUMNS eng "Wrong number of columns" ER_SEQUENCE_TABLE_CANNOT_HAVE_ANY_KEYS @@ -12290,10 +12288,12 @@ ER_VECTOR_BINARY_FORMAT_INVALID eng "Invalid binary vector format. Must use IEEE standard float representation in little-endian format. Use VEC_FromText() to generate it." ER_VECTOR_FORMAT_INVALID eng "Invalid vector format at offset: %d for '%-.100s'. Must be a valid JSON array of numbers." +ER_PSEUDO_THREAD_ID_OVERWRITE + eng "Pseudo thread id should not be modified by the client as it will be overwritten" ER_VEC_DISTANCE_TYPE eng "Cannot determine distance type for VEC_DISTANCE, index is not found" WARN_INDEX_HINTS_IGNORED eng "Index hints are ignored because they are incompatible with RETURNING clause" ukr "Підказки по використанню индексів ігноруются тому що вони несумісні з RETURNING" ER_SIGNAL_SKIP_ROW_FROM_TRIGGER - eng "The row is skipped by a trigger implementation" \ No newline at end of file + eng "The row is skipped by a trigger implementation"