Merge lp:~percona-toolkit-dev/percona-toolkit/fix-pt-index-usage-db-bug-1028614 into lp:percona-toolkit/2.1

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-index-usage'
--- bin/pt-index-usage	2012-07-20 20:25:10 +0000
+++ bin/pt-index-usage	2012-07-28 20:51:20 +0000
@@ -5013,7 +5013,7 @@
 
    my $schema     = new Schema();
    my $schema_itr = new SchemaIterator(
-      dbh          => $dbh,
+      dbh          => $si_dbh,
       OptionParser => $o,
       Quoter       => $q,
       TableParser  => $tp,

=== modified file 't/pt-index-usage/basics.t'
--- t/pt-index-usage/basics.t	2012-06-09 18:43:33 +0000
+++ t/pt-index-usage/basics.t	2012-07-28 20:51:20 +0000
@@ -27,9 +27,6 @@
 if ( !@{ $dbh->selectall_arrayref("show databases like 'sakila'") } ) {
    plan skip_all => "Sakila database is not loaded";
 }
-else {
-   plan tests => 9;
-}
 
 my $cnf     = '/tmp/12345/my.sandbox.cnf';
 my @args    = ('-F', $cnf);
@@ -136,8 +133,23 @@
    'No output without default db'
 );
 
+# https://bugs.launchpad.net/percona-toolkit/+bug/1028614
+$dbh->do("CREATE DATABASE IF NOT EXISTS z");
+$dbh->do("CREATE TABLE z.t (id int)");
+
+ok(
+   no_diff(
+      sub { pt_index_usage::main(@args, qw(-D sakila),
+               "$trunk/$samples/slow006.txt") },
+      "$samples/slow006-report.txt"
+   ),
+   '--database is kept (bug 1028614)'
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
+$sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
 exit;