From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 12 Nov 2020 13:55:22 +0000 (+0100)
Subject: [PATCH 2/2] auth mysql: disable automatic charset detection
X-Git-Tag: archive/raspbian/4.3.1-2+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c487f97ecf6bdcf435b60acbb9fdffae1d2bb98;p=pdns.git

[PATCH 2/2] auth mysql: disable automatic charset detection


Gbp-Pq: Name 9714.patch
---

diff --git a/modules/gmysqlbackend/smysql.cc b/modules/gmysqlbackend/smysql.cc
index 0687cec..c0e467c 100644
--- a/modules/gmysqlbackend/smysql.cc
+++ b/modules/gmysqlbackend/smysql.cc
@@ -465,10 +465,6 @@ void SMySQL::connect()
     }
 #endif
 
-#if MYSQL_VERSION_ID >= 50500
-    mysql_options(&d_db, MYSQL_SET_CHARSET_NAME, MYSQL_AUTODETECT_CHARSET_NAME);
-#endif
-
     if (d_setIsolation && (retry == 1))
       mysql_options(&d_db, MYSQL_INIT_COMMAND,"SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED");