From 606edaa6cd628643203e6cabdc7d873dff542d3c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 28 Mar 2025 21:56:44 +0100 Subject: [PATCH] consistent error messages, no only WARN_OPTION_IGNORED was angle-quotting its parameter, no other error message did it. Remove angle quoting for consistency. --- mysql-test/main/partition_error.result | 16 ++++----- mysql-test/main/partition_not_windows.result | 4 +-- mysql-test/main/partition_symlink.result | 4 +-- mysql-test/main/partition_windows.result | 12 +++---- mysql-test/main/symlink.result | 10 +++--- mysql-test/main/windows.result | 4 +-- .../suite/archive/archive_no_symlink.result | 4 +-- .../suite/archive/archive_symlink.result | 4 +-- .../suite/innodb/r/skip_symbolic_links.result | 12 +++---- .../r/alter_data_directory_innodb.result | 4 +-- .../r/partition_basic_symlink_innodb.result | 8 ++--- .../r/reorganize_partition_innodb.result | 36 +++++++++---------- .../suite/rpl/r/rpl_using_gtid_default.result | 8 ++--- sql/share/errmsg-utf8.txt | 18 +++++----- 14 files changed, 72 insertions(+), 72 deletions(-) diff --git a/mysql-test/main/partition_error.result b/mysql-test/main/partition_error.result index b49b4c40f76..d73777f1e99 100644 --- a/mysql-test/main/partition_error.result +++ b/mysql-test/main/partition_error.result @@ -782,10 +782,10 @@ SUBPARTITION BY HASH(TO_DAYS(purchased)) DATA DIRECTORY = '/tmp/not-existing' INDEX DIRECTORY = '/tmp/not-existing'); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -805,8 +805,8 @@ DATA DIRECTORY = '/tmp/not-existing' INDEX DIRECTORY = '/tmp/not-existing', SUBPARTITION sp1)); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -825,8 +825,8 @@ PARTITION BY RANGE(YEAR(purchased)) DATA DIRECTORY = '/tmp/not-existing' INDEX DIRECTORY = '/tmp/not-existing'); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/main/partition_not_windows.result b/mysql-test/main/partition_not_windows.result index 19c3766fa17..2e2b5ddea63 100644 --- a/mysql-test/main/partition_not_windows.result +++ b/mysql-test/main/partition_not_windows.result @@ -24,8 +24,8 @@ data directory='/not/existing' index directory='/not/existing' ); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored show create table t2; Table Create Table t2 CREATE TABLE `t2` ( diff --git a/mysql-test/main/partition_symlink.result b/mysql-test/main/partition_symlink.result index f9c64e7f7eb..a1572bed3a4 100644 --- a/mysql-test/main/partition_symlink.result +++ b/mysql-test/main/partition_symlink.result @@ -156,8 +156,8 @@ data directory='/not/existing' index directory='/not/existing' ); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored show create table t2; Table Create Table t2 CREATE TABLE `t2` ( diff --git a/mysql-test/main/partition_windows.result b/mysql-test/main/partition_windows.result index 756690925f8..c66f4b7cbb4 100644 --- a/mysql-test/main/partition_windows.result +++ b/mysql-test/main/partition_windows.result @@ -15,16 +15,16 @@ DATA DIRECTORY = 'E:/mysqltest/p2Data' INDEX DIRECTORY = 'F:/mysqltest/p2Index' ); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored INSERT INTO t1 VALUES (NULL, "first", 1); INSERT INTO t1 VALUES (NULL, "second", 2); INSERT INTO t1 VALUES (NULL, "third", 3); ALTER TABLE t1 ADD PARTITION (PARTITION p3 DATA DIRECTORY = 'G:/mysqltest/p3Data' INDEX DIRECTORY = 'H:/mysqltest/p3Index'); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored INSERT INTO t1 VALUES (NULL, "last", 4); DROP TABLE t1; diff --git a/mysql-test/main/symlink.result b/mysql-test/main/symlink.result index 60b9fbe90a7..3170fa35562 100644 --- a/mysql-test/main/symlink.result +++ b/mysql-test/main/symlink.result @@ -86,7 +86,7 @@ drop database mysqltest; create table t1 (a int not null) engine=myisam; alter table t1 data directory="MYSQLTEST_VARDIR/tmp"; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -95,7 +95,7 @@ t1 CREATE TABLE `t1` ( alter table t1 add b int; alter table t1 data directory="MYSQLTEST_VARDIR/log"; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -104,7 +104,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci alter table t1 index directory="MYSQLTEST_VARDIR/log"; Warnings: -Warning 1618 option ignored +Warning 1618 INDEX DIRECTORY option ignored show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -185,8 +185,8 @@ ERROR HY000: Can't create/write to file 'TEST_DIR/master-data_var/t1.MYI' (Errco SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='NO_DIR_IN_CREATE'; CREATE TABLE t1(a INT) DATA DIRECTORY='MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY='MYSQLTEST_VARDIR/tmp'; Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored DROP TABLE t1; SET @@SQL_MODE=@OLD_SQL_MODE; # diff --git a/mysql-test/main/windows.result b/mysql-test/main/windows.result index 05e4600f4b7..5a46f6755c4 100644 --- a/mysql-test/main/windows.result +++ b/mysql-test/main/windows.result @@ -9,8 +9,8 @@ drop table nu; drop table if exists t1; CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM; Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored drop table t1; CREATE TABLE t1 (a int, b int); INSERT INTO t1 VALUES (1,1); diff --git a/mysql-test/suite/archive/archive_no_symlink.result b/mysql-test/suite/archive/archive_no_symlink.result index fa405456b77..ca86ae1afec 100644 --- a/mysql-test/suite/archive/archive_no_symlink.result +++ b/mysql-test/suite/archive/archive_no_symlink.result @@ -10,8 +10,8 @@ PRIMARY KEY (c1)) ENGINE = archive DATA DIRECTORY = 'MYSQL_TMP_DIR/archive' INDEX DIRECTORY = 'MYSQL_TMP_DIR/archive'; Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored INSERT INTO t1 VALUES (NULL, "first", 1); INSERT INTO t1 VALUES (NULL, "second", 2); INSERT INTO t1 VALUES (NULL, "third", 3); diff --git a/mysql-test/suite/archive/archive_symlink.result b/mysql-test/suite/archive/archive_symlink.result index 65b2de11361..0c0cdd7c300 100644 --- a/mysql-test/suite/archive/archive_symlink.result +++ b/mysql-test/suite/archive/archive_symlink.result @@ -11,7 +11,7 @@ ERROR HY000: Can't create table `test`.`t1` (errno: 2 "No such file or directory CREATE TABLE t1 (a int AUTO_INCREMENT KEY, b char(30)) ENGINE archive DATA DIRECTORY = 'MYSQL_TMP_DIR/archive' INDEX DIRECTORY = 'MYSQL_TMP_DIR/archive'; Warnings: -Warning 1618 option ignored +Warning 1618 INDEX DIRECTORY option ignored INSERT INTO t1 VALUES (NULL, "blue"); INSERT INTO t1 VALUES (NULL, "red"); INSERT INTO t1 VALUES (NULL, "yellow"); @@ -35,7 +35,7 @@ NO_DIR_IN_CREATE CREATE TABLE t1 (a int AUTO_INCREMENT KEY, b char(30)) ENGINE archive DATA DIRECTORY = 'MYSQL_TMP_DIR/archive'; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored INSERT INTO t1 VALUES (NULL, "blue"); INSERT INTO t1 VALUES (NULL, "red"); INSERT INTO t1 VALUES (NULL, "yellow"); diff --git a/mysql-test/suite/innodb/r/skip_symbolic_links.result b/mysql-test/suite/innodb/r/skip_symbolic_links.result index c548ece4e2f..6baac5086ff 100644 --- a/mysql-test/suite/innodb/r/skip_symbolic_links.result +++ b/mysql-test/suite/innodb/r/skip_symbolic_links.result @@ -3,12 +3,12 @@ SELECT @@have_symlink; DISABLED CREATE TABLE t1(a INT) ENGINE=InnoDB DATA DIRECTORY 'MYSQL_TMP_DIR'; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored DROP TABLE t1; CREATE TABLE t1(a INT) ENGINE=InnoDB; ALTER TABLE t1 DATA DIRECTORY 'MYSQL_TMP_DIR'; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -35,17 +35,17 @@ DROP TABLE t2; RENAME TABLE t1 TO t2; ALTER TABLE t2 ADD UNIQUE INDEX(b), RENAME TO t3; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored ALTER TABLE t3 RENAME TO t2; ALTER TABLE t2 DROP INDEX b, RENAME TO t1; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored ALTER TABLE t1 CHANGE b c INT; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored ALTER TABLE t1 CHANGE c b INT NOT NULL; Warnings: -Warning 1618 option ignored +Warning 1618 DATA DIRECTORY option ignored t1.ibd TRUNCATE TABLE t1; DROP TABLE t1; diff --git a/mysql-test/suite/parts/r/alter_data_directory_innodb.result b/mysql-test/suite/parts/r/alter_data_directory_innodb.result index 714e3f68477..eacda5a9ec9 100644 --- a/mysql-test/suite/parts/r/alter_data_directory_innodb.result +++ b/mysql-test/suite/parts/r/alter_data_directory_innodb.result @@ -62,8 +62,8 @@ PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB ); Warnings: -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition SHOW CREATE TABLE t; Table Create Table t CREATE TABLE `t` ( diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result index 7108a872b98..97e9bbbe24e 100644 --- a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result +++ b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result @@ -50,12 +50,12 @@ DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 INDEX DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored SHOW WARNINGS; Level Code Message -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 INDEX DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored # Verifying .frm, .par, .isl & .ibd files ---- MYSQLD_DATADIR/test db.opt diff --git a/mysql-test/suite/parts/r/reorganize_partition_innodb.result b/mysql-test/suite/parts/r/reorganize_partition_innodb.result index 745240011cd..b06de4c7ceb 100644 --- a/mysql-test/suite/parts/r/reorganize_partition_innodb.result +++ b/mysql-test/suite/parts/r/reorganize_partition_innodb.result @@ -62,8 +62,8 @@ PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB ); Warnings: -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition SHOW CREATE TABLE t; Table Create Table t CREATE TABLE `t` ( @@ -78,8 +78,8 @@ PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/', PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ); Warnings: -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition SHOW CREATE TABLE t; Table Create Table t CREATE TABLE `t` ( @@ -94,8 +94,8 @@ PARTITION p1 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB ); Warnings: -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition +Warning 1982 INDEX DIRECTORY option ignored for InnoDB partition +Warning 1982 INDEX DIRECTORY option ignored for InnoDB partition SHOW CREATE TABLE t; Table Create Table t CREATE TABLE `t` ( @@ -125,10 +125,10 @@ DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here/' ENGINE = INNODB ); Warnings: -Warning 1618 option ignored -Warning 1618 option ignored -Warning 1618 option ignored -Warning 1618 option ignored +Warning 1618 INDEX DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored +Warning 1618 INDEX DIRECTORY option ignored SET innodb_strict_mode=@strict; ALTER TABLE t REORGANIZE PARTITION p1,p2 INTO @@ -143,14 +143,14 @@ DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB ); Warnings: -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition -Warning 1982 option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition +Warning 1982 INDEX DIRECTORY option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition +Warning 1982 INDEX DIRECTORY option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition +Warning 1982 INDEX DIRECTORY option ignored for InnoDB partition +Warning 1982 DATA DIRECTORY option ignored for InnoDB partition +Warning 1982 INDEX DIRECTORY option ignored for InnoDB partition SHOW CREATE TABLE t; Table Create Table t CREATE TABLE `t` ( diff --git a/mysql-test/suite/rpl/r/rpl_using_gtid_default.result b/mysql-test/suite/rpl/r/rpl_using_gtid_default.result index 24a316de1bd..2d785a3fe56 100644 --- a/mysql-test/suite/rpl/r/rpl_using_gtid_default.result +++ b/mysql-test/suite/rpl/r/rpl_using_gtid_default.result @@ -133,12 +133,12 @@ connection slave; include/stop_slave.inc CHANGE MASTER TO master_log_pos=io_log_pos, master_log_file='io_log_file', master_use_gtid=Slave_Pos; Warnings: -Note 1618 option ignored -Note 1618 option ignored +Note 1618 MASTER_LOG_FILE option ignored +Note 1618 MASTER_LOG_POS option ignored CHANGE MASTER TO relay_log_pos=relay_log_pos, relay_log_file='relay_log_file', master_use_gtid=Slave_Pos; Warnings: -Note 1618 option ignored -Note 1618 option ignored +Note 1618 RELAY_LOG_FILE option ignored +Note 1618 RELAY_LOG_POS option ignored include/start_slave.inc include/rpl_end.inc # diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index f8d1a47c9f9..d18e805790b 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -8445,11 +8445,11 @@ WARN_NO_MASTER_INFO spa "No existe conexión maestra '%.*s'" sw "Hakuna muunganisho mkuu '%.*s'" WARN_OPTION_IGNORED - eng "<%-.64s> option ignored" - ger "Option <%-.64s> ignoriert" - geo "პარამეტრი <%-.64s> იგნორირებულია" - spa "Opción <%-.64s> ignorada" - sw "<%-.64s> chaguo limepuuzwa" + eng "%s option ignored" + ger "Option %s ignoriert" + geo "პარამეტრი %s იგნორირებულია" + spa "Opción %s ignorada" + sw "%s chaguo limepuuzwa" ER_PLUGIN_DELETE_BUILTIN chi "内置插件无法删除" eng "Built-in plugins cannot be deleted" @@ -10594,10 +10594,10 @@ ER_WARN_AGGFUNC_DEPENDENCE sw "Jumla ya kukokotoa '%-.192s)' ya SELECT #%d ni ya SELECT #%d" ukr "Агрегатна функція '%-.192s)' з SELECTу #%d належить до SELECTу #%d" WARN_INNODB_PARTITION_OPTION_IGNORED - chi "<%-.64s> innodb分区忽略的选项" - eng "<%-.64s> option ignored for InnoDB partition" - spa "<%-.64s> opción ignorada para partición InnoDB" - sw "<%-.64s> chaguo limepuuzwa kwa kizigeu cha InnoDB" + chi "%s innodb分区忽略的选项" + eng "%s option ignored for InnoDB partition" + spa "%s opción ignorada para partición InnoDB" + sw " %s chaguo limepuuzwa kwa kizigeu cha InnoDB" # # Internal errors, not used