MDEV-37784 fix the warning

vuvova · vuvova · commit 399edc7c6205 · 2025-10-06T12:30:38.000+02:00
cannot add new warnings in 11.8 anymore:
* remove ER_WARN_DEFAULT_SYNTAX
* use ER_VARIABLE_IGNORED instead
* change the wording in it to be more generic
* simplified new_mode warning-printing code
diff --git 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	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 setting 'alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warnings:
-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 setting '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	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 setting 'alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warnings:
-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 setting '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	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 setting 'alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 Warnings:
-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 setting '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/repair.result b/mysql-test/main/repair.result
@@ -307,16 +307,16 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 GLOBAL_VALUE_PATH	NULL
 set alter_algorithm=COPY;
 Warnings:
-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 setting '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	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
+Warning	4200	The setting 'alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The setting '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
@@ -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	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
+Warning	4200	The setting '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 setting '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	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
+Warning	4200	The setting '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 setting '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	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 setting '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	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 setting '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	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 setting '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	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 setting '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/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	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 setting '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	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 setting '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
@@ -5,10 +5,10 @@ SELECT @global_start_value;
 '#--------------------FN_DYNVARS_046_01------------------------#'
 SET @@global.innodb_purge_rseg_truncate_frequency = 1;
 Warnings:
-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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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	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	4200	The setting '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/new_mode.result b/mysql-test/suite/sys_vars/r/new_mode.result
@@ -22,11 +22,11 @@ SELECT @@session.new_mode;
 
 SET @@session.new_mode = "FIX_DISK_TMPTABLE_COSTS,TEST_WARNING1";
 Warnings:
-Warning	4209	'TEST_WARNING1' is default and ignored
+Warning	4200	The setting 'new_mode=TEST_WARNING1' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 SET @@session.new_mode = "FIX_DISK_TMPTABLE_COSTS,TEST_WARNING1,TEST_WARNING2";
 Warnings:
-Warning	4209	'TEST_WARNING1' is default and ignored
-Warning	4209	'TEST_WARNING2' is default and ignored
+Warning	4200	The setting 'new_mode=TEST_WARNING1' is ignored. It only exists for compatibility with old installations and will be removed in a future release
+Warning	4200	The setting 'new_mode=TEST_WARNING2' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 SET @@session.new_mode = "FIX_DISK_TMPTABLE_COSTS,TEST_WARNING1,TEST_WARNING2,TEST_WARNING3";
 ERROR 42000: Variable 'new_mode' can't be set to the value of 'TEST_WARNING3'
 SET @@session.new_mode = "ALL";
diff --git a/mysql-test/suite/sys_vars/r/new_mode_notembedded.result b/mysql-test/suite/sys_vars/r/new_mode_notembedded.result
@@ -0,0 +1,2 @@
+call mtr.add_suppression('new_mode=TEST_WARNING1');
+FOUND 1 /new_mode=TEST_WARNING1/ in mysqld.1.err
diff --git a/mysql-test/suite/sys_vars/t/new_mode_notembedded.opt b/mysql-test/suite/sys_vars/t/new_mode_notembedded.opt
@@ -0,0 +1 @@
+--new-mode=TEST_WARNING1
diff --git a/mysql-test/suite/sys_vars/t/new_mode_notembedded.test b/mysql-test/suite/sys_vars/t/new_mode_notembedded.test
@@ -0,0 +1,7 @@
+--source include/have_debug.inc
+--source include/not_embedded.inc
+
+call mtr.add_suppression('new_mode=TEST_WARNING1');
+--let SEARCH_PATTERN=new_mode=TEST_WARNING1
+--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
+--source include/search_pattern_in_file.inc
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -4267,6 +4267,7 @@ static int init_common_variables()
   global_system_variables.lc_messages= my_default_lc_messages;
   global_system_variables.errmsgs= my_default_lc_messages->errmsgs->errmsgs;
   init_client_errs();
+  check_new_mode_value(NULL, &global_system_variables.new_behavior);
   mysql_library_init(unused,unused,unused); /* for replication */
   lex_init();
   if (item_create_init())
@@ -8816,8 +8817,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
                                            OLD_MODE_COMPAT_5_1_CHECKSUM);
   }
 
-  check_new_mode_value(NULL, &global_system_variables.new_behavior);
-
   if (global_system_variables.net_buffer_length > 
       global_system_variables.max_allowed_packet)
   {
diff --git a/sql/set_var.cc b/sql/set_var.cc
@@ -428,15 +428,13 @@ void sys_var::do_deprecated_warning(THD *thd)
 {
   if (option.deprecation_substitute != NULL)
   {
-    char buf1[NAME_CHAR_LEN + 3];
-    strxnmov(buf1, sizeof(buf1)-1, "@@", name.str, 0);
-
     if (option.comment == UNUSED_HELP ||
         strcmp(option.comment, UNUSED_HELP) == 0)
-      my_error(ER_VARIABLE_IGNORED, MYF(ME_WARNING), buf1);
+      my_error(ER_VARIABLE_IGNORED, MYF(ME_WARNING), name.str);
     else
     {
-      char buf2[NAME_CHAR_LEN + 3];
+      char buf1[NAME_CHAR_LEN + 3], buf2[NAME_CHAR_LEN + 3];
+      strxnmov(buf1, sizeof(buf1)-1, "@@", name.str, 0);
       if (!IS_DEPRECATED_NO_REPLACEMENT(option.deprecation_substitute))
         strxnmov(buf2, sizeof(buf2)-1, "@@", option.deprecation_substitute, 0);
       else
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
@@ -12275,7 +12275,7 @@ ER_SEQUENCE_TABLE_CANNOT_HAVE_ANY_CONSTRAINTS
 ER_SEQUENCE_TABLE_ORDER_BY
         eng "ORDER BY"
 ER_VARIABLE_IGNORED
-        eng "The variable '%s' is ignored. It only exists for compatibility with old installations and will be removed in a future release"
+        eng "The setting '%s' is ignored. It only exists for compatibility with old installations and will be removed in a future release"
 ER_INCORRECT_COLUMN_NAME_COUNT
         eng "Incorrect column name count for derived table"
         chi "派生表的列名计数不正确"
@@ -12297,8 +12297,3 @@ WARN_INDEX_HINTS_IGNORED
         ukr "Підказки по використанню индексів ігноруются тому що вони несумісні з RETURNING"
 ER_SIGNAL_SKIP_ROW_FROM_TRIGGER
         eng "The row is skipped by a trigger implementation"
-ER_WARN_DEFAULT_SYNTAX
-        chi "'%s' 默认并被忽略"
-        eng "'%s' is default and ignored"
-        ger "'%s' ist Standard und wird ignoriert"
-        spa "'%s' Es predeterminado e ignorado"
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+call mtr.add_suppression('new_mode=TEST_WARNING1');`
	`2`	`+FOUND 1 /new_mode=TEST_WARNING1/ in mysqld.1.err`