debian/pkg-monitoring-plugins
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adding d/p/27_check_mysql_fix_replica, Fixes reported regression for MariaDB 10.11.14-0+deb12u2 (Closes: #1116027)

Browse source
This commit is contained in:
Jan Wagner 2025-11-28 12:47:47 +00:00
parent 861c613c8a
commit dfe02ab020
2 changed files with 52 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

51
debian/patches/27_check_mysql_fix_replica vendored Normal file
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;
}
}

1
debian/patches/series vendored
View file

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