mirror of
https://github.com/MariaDB/server.git
synced 2025-07-04 02:18:12 +02:00
5de8e2dde3
* 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`
19 lines
905 B
Text
19 lines
905 B
Text
include/master-slave.inc
|
|
[connection master]
|
|
connection master;
|
|
create table t1 (a int, unique(a)) engine=myisam;
|
|
set sql_log_bin=0;
|
|
insert into t1 values(2);
|
|
set sql_log_bin=1;
|
|
insert into t1 values(1),(2);
|
|
ERROR 23000: Duplicate entry '2' for key 'a'
|
|
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 '%-.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
|
|
RESET SLAVE;
|
|
include/rpl_end.inc
|