Compare commits

...

4 commits

Author SHA1 Message Date
dfe02ab020 Adding d/p/27_check_mysql_fix_replica, Fixes reported regression for MariaDB 10.11.14-0+deb12u2 (Closes: #1116027) 2025-12-02 11:38:19 +00:00
Bas Couwenberg
861c613c8a Don't use test-build-validate-cleanup, fails where pbuilder --twice succeeds.
dpkg trolerates removal of generated autotools files, the CI job has no tolerance whatsoever.
2025-11-28 14:31:19 +01:00
Bas Couwenberg
f047b0543d Use debrebuild instead of reprotest. 2025-11-28 12:16:26 +01:00
Bas Couwenberg
52d9fc3bc3 Use test-build-validate-cleanup instead of test-build-twice. 2025-10-25 12:49:13 +02:00
3 changed files with 53 additions and 2 deletions

View file

@ -9,7 +9,6 @@ variables:
SALSA_CI_DISABLE_BLHC: 1
SALSA_CI_DISABLE_LINTIAN: 0
SALSA_CI_DISABLE_PIUPARTS: 0
SALSA_CI_DISABLE_REPROTEST: 0
SALSA_CI_DISABLE_DEBREBUILD: 0
SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0
SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0
SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1

View file

@ -0,0 +1,51 @@
Backport of https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2184.patch
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -300,32 +300,20 @@
num_fields = mysql_num_fields(res);
fields = mysql_fetch_fields(res);
for(i = 0; i < num_fields; i++) {
- if (use_deprecated_slave_status) {
- if (strcmp(fields[i].name, "Slave_IO_Running") == 0) {
- slave_io_field = i;
- continue;
- }
- if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) {
- slave_sql_field = i;
- continue;
- }
- if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) {
- seconds_behind_field = i;
- continue;
- }
- } else {
- if (strcmp(fields[i].name, "Replica_IO_Running") == 0) {
- slave_io_field = i;
- continue;
- }
- if (strcmp(fields[i].name, "Replica_SQL_Running") == 0) {
- slave_sql_field = i;
- continue;
- }
- if (strcmp(fields[i].name, "Seconds_Behind_Source") == 0) {
- seconds_behind_field = i;
- continue;
- }
+ if ((strcmp(fields[i].name, "Slave_IO_Running") == 0) ||
+ (strcmp(fields[i].name, "Replica_IO_Running") == 0)) {
+ slave_io_field = i;
+ continue;
+ }
+ if ((strcmp(fields[i].name, "Slave_SQL_Running") == 0) ||
+ (strcmp(fields[i].name, "Replica_SQL_Running") == 0)) {
+ slave_sql_field = i;
+ continue;
+ }
+ if ((strcmp(fields[i].name, "Seconds_Behind_Master") == 0) ||
+ (strcmp(fields[i].name, "Seconds_Behind_Source") == 0)) {
+ seconds_behind_field = i;
+ continue;
}
}

View file

@ -20,3 +20,4 @@
25_check_users_sd_get_uids
26_check_mysql_replica
# feature patches
27_check_mysql_fix_replica