aboutsummaryrefslogtreecommitdiffstats
path: root/main/pmacct/mariadb.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/pmacct/mariadb.patch')
-rw-r--r--main/pmacct/mariadb.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/main/pmacct/mariadb.patch b/main/pmacct/mariadb.patch
new file mode 100644
index 0000000000..ded2d0faf4
--- /dev/null
+++ b/main/pmacct/mariadb.patch
@@ -0,0 +1,25 @@
+diff --git a/src/mysql_plugin.c b/src/mysql_plugin.c
+index d2503e7..d477270 100644
+--- a/src/mysql_plugin.c
++++ b/src/mysql_plugin.c
+@@ -668,8 +668,9 @@ void MY_DB_Connect(struct DBdesc *db, char *host)
+ MYSQL *dbptr = db->desc;
+
+ if (!db->fail) {
++ my_bool reconnect = 1;
+ mysql_init(db->desc);
+- dbptr->reconnect = TRUE;
++ mysql_options(db->desc, MYSQL_OPT_RECONNECT, &reconnect);
+ if (!mysql_real_connect(db->desc, host, config.sql_user, config.sql_passwd, config.sql_db, 0, NULL, 0)) {
+ sql_db_fail(db);
+ MY_get_errmsg(db);
+@@ -768,5 +769,9 @@ void MY_init_default_values(struct insert_data *idata)
+
+ void MY_mysql_get_version()
+ {
++#ifdef MARIADB_CLIENT_VERSION_STR
++ printf("MySQL %s\n", MARIADB_CLIENT_VERSION_STR);
++#else
+ printf("MySQL %s\n", MYSQL_SERVER_VERSION);
++#endif
+ }