Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1059732-ptc-hash-functions into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2012-10-26 23:06:21 +0000
+++ bin/pt-table-checksum	2012-10-30 22:39:32 +0000
@@ -5287,6 +5287,7 @@
       if ( $EVAL_ERROR && $EVAL_ERROR =~ m/failed: (.*?) at \S+ line/ ) {
          $error .= qq{$func cannot be used because "$1"\n};
          PTDEBUG && _d($func, 'cannot be used because', $1);
+         next;
       }
       PTDEBUG && _d('Chosen hash func:', $result);
       return $func;
 
=== modified file 'lib/RowChecksum.pm'
--- lib/RowChecksum.pm	2012-08-02 14:29:57 +0000
+++ lib/RowChecksum.pm	2012-10-30 22:39:32 +0000
@@ -274,7 +274,7 @@
    }
    my ($dbh) = @args{@required_args};
    my $o     = $self->{OptionParser};
-   my @funcs = qw(CRC32 FNV1A_64 FNV_64 MD5 SHA1);
+   my @funcs = qw(CRC32 FNV1A_64 FNV_64 MURMUR_HASH MD5 SHA1);
 
    if ( my $func = $o->get('function') ) {
       unshift @funcs, $func;
@@ -290,11 +290,12 @@
       if ( $EVAL_ERROR && $EVAL_ERROR =~ m/failed: (.*?) at \S+ line/ ) {
          $error .= qq{$func cannot be used because "$1"\n};
          PTDEBUG && _d($func, 'cannot be used because', $1);
+         next;
       }
       PTDEBUG && _d('Chosen hash func:', $result);
       return $func;
    }
-   die $error || 'No hash functions (CRC32, MD5, etc.) are available';
+   die($error || 'No hash functions (CRC32, MD5, etc.) are available');
 }
 
 # Returns how wide/long, in characters, a CRC function is.
 
=== modified file 't/lib/RowChecksum.t'
--- t/lib/RowChecksum.t	2012-08-02 14:29:57 +0000
+++ t/lib/RowChecksum.t	2012-10-30 22:39:32 +0000
@@ -461,6 +461,22 @@
    'Dies if all columns are ignored by --columns'
 );
 
+# #############################################################################
+# pt-table-checksum doesn't test all hash functions
+# https://bugs.launchpad.net/percona-toolkit/+bug/1059732
+# #############################################################################
+
+@ARGV = qw(--function FALSEFUNC);
+$o->get_opts();
+
+unlike(
+   $c->_get_hash_func(
+      dbh => $dbh,
+   ),
+   qr/FALSEFUNC/,
+   "_get_hash_func doesn't return failed functions",
+);
+
 # ############################################################################
 # Done.
 # ############################################################################