Largely working, but un-tested, pt-upgrade 2.2 for host-to-host comparison. Add EventExecutor.pm.

lib/QueryIterator.pm

@@ -62,12 +62,6 @@ has 'oktorun' => (
 # Optional
 ##
 
-has 'default_database' => (
-   is       => 'rw',
-   isa      => 'Maybe[Str]',
-   required => 0,
-);
-
 has 'filter' => (
    is       => 'ro',
    isa      => 'CodeRef',
@@ -99,12 +93,6 @@ has 'stats' => (
    default  => sub { return {} },
 );
 
-has 'database' => (
-   is       => 'rw',
-   isa      => 'Maybe[Str]',
-   required => 0,
-);
-
 has '_fh' => (
    is       => 'rw',
    isa      => 'Maybe[FileHandle]',
@@ -236,15 +224,6 @@ sub next {
 
       $event->{fingerprint} = $self->fingerprint->($event->{arg});
 
-      my $current_db = $self->database;
-      my $db = $event->{db} || $event->{Schema} || $self->default_database;
-      if ( $db && (!$current_db || $current_db ne $db) ) {
-         $self->database($db);
-      }
-      else {
-         $self->database(undef);
-      }
-
       return $event;
    }