From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 13 Jan 2014 21:26:23 +0000 (+0100)
Subject: Revert "set binlog_format='ROW' if (gmysql-)innodb-read-committed is enabled"
X-Git-Tag: rec-3.6.0-rc1~244^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=beb3772035c17a481b629ca07dee51e4f15f3fe0;p=pdns

Revert "set binlog_format='ROW' if (gmysql-)innodb-read-committed is enabled"
"set binlog_format='ROW' requires SUPER privilege

This reverts commit 817975345de3127aeb4e25bc52b2dc38577d29b3.
---

diff --git a/modules/gmysqlbackend/smysql.cc b/modules/gmysqlbackend/smysql.cc
index 4942f53ac..e20aa9fb2 100644
--- a/modules/gmysqlbackend/smysql.cc
+++ b/modules/gmysqlbackend/smysql.cc
@@ -37,10 +37,8 @@ SMySQL::SMySQL(const string &database, const string &host, uint16_t port, const
     mysql_options(&d_db, MYSQL_SET_CHARSET_NAME, MYSQL_AUTODETECT_CHARSET_NAME);
 #endif
 
-    if (setIsolation && (retry == 1)) {
+    if (setIsolation && (retry == 1))
       mysql_options(&d_db, MYSQL_INIT_COMMAND,"SET SESSION tx_isolation='READ-COMMITTED'");
-      mysql_options(&d_db, MYSQL_INIT_COMMAND,"SET SESSION binlog_format='ROW'");
-    }
 
     mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, group.c_str());