[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 0687cec7ebadfe4a9ee2ef43f072d39d5addad52..c0e467c6d7f8575fb9b6e55e5d653d761b1a401f 100644 (file)
--- 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");