From 89e700c3c38a1e02d9d818c7dc0b7b191ac9e330 Mon Sep 17 00:00:00 2001
From: Carlos Salguero <carlos.salguero@percona.com>
Date: Thu, 21 Sep 2017 11:31:36 -0300
Subject: [PATCH] Revert "Turn off statement based binlog checks"

---
 bin/pt-table-checksum | 57 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 02a32f42..32d084bf 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -9331,36 +9331,35 @@ sub main {
          die "Error setting SQL_MODE"
            . ": $EVAL_ERROR";
       }
+ 
 
-      if ( $o->get('check-binlog-format') ) {
-        # https://bugs.launchpad.net/percona-toolkit/+bug/919352
-        # The tool shouldn't blindly attempt to change binlog_format;
-        # instead, it should check if it's already set to STATEMENT.
-        # This is becase starting with MySQL 5.1.29, changing the format
-        # requires a SUPER user.
-        if ( VersionParser->new($dbh) >= '5.1.5' ) {
-           $sql = 'SELECT @@binlog_format';
-           PTDEBUG && _d($dbh, $sql);
-           my ($original_binlog_format) = $dbh->selectrow_array($sql);
-           PTDEBUG && _d('Original binlog_format:', $original_binlog_format);
-           if ( $original_binlog_format !~ /STATEMENT/i ) {
-              $sql = q{/*!50108 SET @@binlog_format := 'STATEMENT'*/};
-              eval {
-                 PTDEBUG && _d($dbh, $sql);
-                 $dbh->do($sql);
-              };
-              if ( $EVAL_ERROR ) {
-                 die "Failed to $sql: $EVAL_ERROR\n"
-                    . "This tool requires binlog_format=STATEMENT, "
-                    . "but the current binlog_format is set to "
-                    ."$original_binlog_format and an error occurred while "
-                    . "attempting to change it.  If running MySQL 5.1.29 or newer, "
-                    . "setting binlog_format requires the SUPER privilege.  "
-                    . "You will need to manually set binlog_format to 'STATEMENT' "
-                    . "before running this tool.\n";
-              }
-           }
-        }
+      # https://bugs.launchpad.net/percona-toolkit/+bug/919352
+      # The tool shouldn't blindly attempt to change binlog_format;
+      # instead, it should check if it's already set to STATEMENT.
+      # This is becase starting with MySQL 5.1.29, changing the format
+      # requires a SUPER user.
+      if ( VersionParser->new($dbh) >= '5.1.5' ) {
+         $sql = 'SELECT @@binlog_format';
+         PTDEBUG && _d($dbh, $sql);
+         my ($original_binlog_format) = $dbh->selectrow_array($sql);
+         PTDEBUG && _d('Original binlog_format:', $original_binlog_format);
+         if ( $original_binlog_format !~ /STATEMENT/i ) {
+            $sql = q{/*!50108 SET @@binlog_format := 'STATEMENT'*/};
+            eval {
+               PTDEBUG && _d($dbh, $sql);
+               $dbh->do($sql);
+            };
+            if ( $EVAL_ERROR ) {
+               die "Failed to $sql: $EVAL_ERROR\n"
+                  . "This tool requires binlog_format=STATEMENT, "
+                  . "but the current binlog_format is set to "
+                  ."$original_binlog_format and an error occurred while "
+                  . "attempting to change it.  If running MySQL 5.1.29 or newer, "
+                  . "setting binlog_format requires the SUPER privilege.  "
+                  . "You will need to manually set binlog_format to 'STATEMENT' "
+                  . "before running this tool.\n";
+            }
+         }
       }
 
       # Set transaction isolation level. We set binlog_format to STATEMENT,