1
0
mirror of https://github.com/MariaDB/server.git synced 2025-04-18 21:44:20 +03:00

Update errmsg-utf8.txt re my_snprintf suffixes

* Migrate `sql/share/errmsg-utf8.txt` to use suffix-based, `-Wformat`
  -compatible `my_snprintf` format extensions introduced in MDEV-21978
* Update relevant tests caught by BuildBot as well

While GCC `-Wformat` (with `ATTRIBUTE_FORMAT`) can catch obsolete or
malformed format string literals, formats originating from other sources
(such as this translations file) (still) require manual review.

This commit also escapes the only (1) instance of existing strings
conflicted by the introduction of suffixes:
(Not all `printf`s goes to `my_snprintf`, thus I `grep`ped and
confirmed that this does indeed land on `my_snprintf` eventually.)
    chi "不能%sSLAVE'%.*s'"

This commit also fixes the following: (You’re welcome.)
* Delete extraneous spaces after the `%` (they’re all Swahili)
* Update `extra/comp_err.c`
  * Add the missing standard C/C++ specifiers `c`, `i`, `o`, `p` and `X`
    (Especially `%i`: it otherwise was complaining about the new `%iE`)
  * Removed the old and obsolete extension formats `%b`, `%M` and `%T`
This commit is contained in:
ParadoxV5 2024-08-14 23:52:58 -06:00 committed by Sergei Golubchik
parent 202c2fb151
commit 5de8e2dde3
7 changed files with 1318 additions and 1315 deletions

View File

@ -774,12 +774,15 @@ static ha_checksum checksum_format_specifier(const char* msg)
{
chksum= my_checksum(chksum, p, 1);
switch(*p) {
case 'c':
case 'd':
case 'i':
case 'o':
case 'p':
case 'u':
case 'x':
case 'X':
case 's':
case 'M':
case 'T':
start= 0; /* Not in format specifier anymore */
break;
}

View File

@ -2,7 +2,7 @@ MariaDB error code 150: Foreign key constraint is incorrectly formed
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
OS error code 23: Too many open files in system
Win32 error code 23: Data error (cyclic redundancy check).
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192T' for key %d
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192sT' for key %d
Learn more: https://mariadb.com/kb/en/e1062/
Win32 error code 1062: The service has not been started.
Illegal error code: 30000

View File

@ -1,10 +1,10 @@
Illegal error code: 10000
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192T' for key %d
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192sT' for key %d
Learn more: https://mariadb.com/kb/en/e1062/
MariaDB error code 1408 (ER_STARTUP): %s: ready for connections.
Version: '%s' socket: '%s' port: %d %s
Learn more: https://mariadb.com/kb/en/e1408/
MariaDB error code 1459 (ER_TABLE_NEEDS_UPGRADE): Upgrade required. Please do "REPAIR %s %`s" or dump/reload to fix it!
MariaDB error code 1459 (ER_TABLE_NEEDS_UPGRADE): Upgrade required. Please do "REPAIR %s %sQ" or dump/reload to fix it!
Learn more: https://mariadb.com/kb/en/e1459/
MariaDB error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %u)
Learn more: https://mariadb.com/kb/en/e1461/

View File

@ -106,7 +106,7 @@ RAISE dup_val_on_index;
END;
$$
CALL p1();
ERROR 23000: Duplicate entry '%-.192T' for key %d
ERROR 23000: Duplicate entry '%-.192sT' for key %d
DROP PROCEDURE p1;
CREATE PROCEDURE p1
AS

View File

@ -11,7 +11,7 @@ drop table t1;
connection slave;
include/wait_for_slave_sql_to_stop.inc
call mtr.add_suppression("Slave SQL.*Query caused different errors on master and slave.*Error on master:.* error code=1062.*Error on slave:.* error.* 0");
Error: "Query caused different errors on master and slave. Error on master: message (format)='Duplicate entry '%-.192T' for key %d' error code=1062 ; Error on slave: actual message='no error', error code=0. Default database: 'test'. Query: 'insert into t1 values(1),(2)'" (expected different error codes on master and slave)
Error: "Query caused different errors on master and slave. Error on master: message (format)='Duplicate entry '%-.192sT' for key %d' error code=1062 ; Error on slave: actual message='no error', error code=0. Default database: 'test'. Query: 'insert into t1 values(1),(2)'" (expected different error codes on master and slave)
Errno: "0" (expected 0)
drop table t1;
include/stop_slave.inc

View File

@ -18,9 +18,9 @@ You will notice as part of your translation work, you will have to add your lang
sw "isamchk"
sw "LA"
sw "NDIYO"
sw "Haiwezi kuunda faili '% -.200s' (kosa: %M)"
sw "Haiwezi kuunda jedwali %`s.%`s (kosa: %M)"
sw "Haiwezi kuunda hifadhidata '% -.192s' (kosa: %M)"
sw "Haiwezi kuunda faili '% -.200s' (kosa: %iE)"
sw "Haiwezi kuunda jedwali %`s.%`s (kosa: %iE)"
sw "Haiwezi kuunda hifadhidata '% -.192s' (kosa: %iE)"
sw "Haiwezi kuunda hifadhidata '% -.192s'; hifadhidata ipo"
Note that Google translate removes the leading whitespace in the translation file it generates. DO NOT add that leading whitespace back!

File diff suppressed because it is too large Load Diff