From 78cae8b91b0cb79e3bc62d74cf97b2abb26ec131 Mon Sep 17 00:00:00 2001
From: Brian Fraser <brian.fraser@percona.com>
Date: Mon, 25 Feb 2013 12:37:23 -0300
Subject: [PATCH] Removed --check-attributes-limit

---
 bin/pt-query-digest                  | 3 +--
 t/pt-query-digest/issue_514.t        | 3 ++-
 t/pt-query-digest/slowlog_analyses.t | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 3525cf45..d8ea9e6a 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -5171,7 +5171,7 @@ sub new {
          keys %$attributes
       },
       worst          => $args{worst},
-      unroll_limit   => $args{unroll_limit} || 1000,
+      unroll_limit   => $ENV{PT_QUERY_DIGEST_CHECK_ATTRIB_LIMIT} || 1000,
       attrib_limit   => $args{attrib_limit},
       result_classes => {},
       result_globals => {},
@@ -13455,7 +13455,6 @@ sub main {
          worst             => $orderby_attrib,
          attrib_limit      => $o->get('attribute-value-limit'),
          ignore_attributes => $o->get('ignore-attributes'),
-         unroll_limit      => $o->get('check-attributes-limit'),
          type_for          => $type_for,
       );
       push @ea, $ea;
diff --git a/t/pt-query-digest/issue_514.t b/t/pt-query-digest/issue_514.t
index 404efce1..e06751cf 100644
--- a/t/pt-query-digest/issue_514.t
+++ b/t/pt-query-digest/issue_514.t
@@ -23,7 +23,8 @@ my $output;
 # #############################################################################
 # This issue actually introduced --check-attributes-limit.
 $cmd = "${run_with}slow030.txt";
-$output = `$cmd --check-attributes-limit 100 2>&1`;
+local $ENV{PT_QUERY_DIGEST_CHECK_ATTRIB_LIMIT} = 100;
+$output = `$cmd 2>&1`;
 unlike(
    $output,
    qr/IDB IO rb/,
diff --git a/t/pt-query-digest/slowlog_analyses.t b/t/pt-query-digest/slowlog_analyses.t
index eb4eef0f..befdb591 100644
--- a/t/pt-query-digest/slowlog_analyses.t
+++ b/t/pt-query-digest/slowlog_analyses.t
@@ -387,8 +387,11 @@ ok(
 # #############################################################################
 ok(
    no_diff(
-      sub { pt_query_digest::main(@args, $sample.'slow054.txt',
-         qw(--check-attributes-limit 5)) },
+      sub {
+         local $ENV{PT_QUERY_DIGEST_CHECK_ATTRIB_LIMIT} = 5;
+         pt_query_digest::main(@args, $sample.'slow054.txt',
+            qw(--check-attributes-limit 5))
+      },
       "t/pt-query-digest/samples/slow054.txt",
    ),
    'Analysis for slow054 (InnoDB_trx_id bug 821694)'