From 2b76371a4fdd433c628bfb82f19f5f328dcb723a Mon Sep 17 00:00:00 2001
From: Carlos Salguero <carlos.salguero@percona.com>
Date: Fri, 10 Mar 2017 17:06:20 -0300
Subject: [PATCH] PT-96 Fixed LOCAL DATA INFILE commands and JSON format

---
 t/lib/JSONReportFormatter.t      | 2 +-
 t/pt-query-digest/json.t         | 3 ++-
 t/pt-table-checksum/basics.t     | 2 +-
 t/pt-table-checksum/chunk_size.t | 2 +-
 t/pt-table-checksum/resume.t     | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/t/lib/JSONReportFormatter.t b/t/lib/JSONReportFormatter.t
index 29b5b68f..c064a63d 100644
--- a/t/lib/JSONReportFormatter.t
+++ b/t/lib/JSONReportFormatter.t
@@ -4,7 +4,7 @@ BEGIN {
    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
       unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
    unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-   $ENV{PTTEST_PRETTY_JSON} = 1;
+   $ENV{PTTEST_PRETTY_JSON} = 0;
 
 };
 
diff --git a/t/pt-query-digest/json.t b/t/pt-query-digest/json.t
index 8ae18ee4..d9712075 100644
--- a/t/pt-query-digest/json.t
+++ b/t/pt-query-digest/json.t
@@ -4,6 +4,7 @@ BEGIN {
    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
       unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
    unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+   $ENV{PTTEST_PRETTY_JSON} = 0;
 };
 
 use strict;
@@ -16,7 +17,7 @@ require "$trunk/bin/pt-query-digest";
 
 no warnings 'once';
 local $JSONReportFormatter::sorted_json = 1;
-local $JSONReportFormatter::pretty_json = 1;
+local $JSONReportFormatter::pretty_json = 0;
 
 my @args    = qw(--output json);
 my $sample  = "$trunk/t/lib/samples";
diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t
index d276c8e0..788fcc08 100644
--- a/t/pt-table-checksum/basics.t
+++ b/t/pt-table-checksum/basics.t
@@ -430,7 +430,7 @@ is(
 # Test --where.
 # #############################################################################
 $sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
-$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
+$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args,
diff --git a/t/pt-table-checksum/chunk_size.t b/t/pt-table-checksum/chunk_size.t
index 5c9b8be4..d5dfc740 100644
--- a/t/pt-table-checksum/chunk_size.t
+++ b/t/pt-table-checksum/chunk_size.t
@@ -111,7 +111,7 @@ unlike(
 # on replicas
 # #############################################################################
 $sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
-$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
+$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
 $master_dbh->do("SET SQL_LOG_BIN=0");
 $master_dbh->do("DELETE FROM test.t WHERE id > 100");
 $master_dbh->do("SET SQL_LOG_BIN=1");
diff --git a/t/pt-table-checksum/resume.t b/t/pt-table-checksum/resume.t
index f6753a09..7ab947c3 100644
--- a/t/pt-table-checksum/resume.t
+++ b/t/pt-table-checksum/resume.t
@@ -41,7 +41,7 @@ my $output;
 sub load_data_infile {
    my ($file, $where) = @_;
    $master_dbh->do('truncate table percona.checksums');
-   $master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums");
+   $master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums");
    if ( $where ) {
       PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', $where);
    }