Fix a bazillion tests with ANSI sql_mode, and get rid of a bunch of MySQLDump usage.

bin/pt-slave-restart

@@ -79,6 +79,48 @@ sub join_quote {
    return $db ? "$db.$tbl" : $tbl;
 }
 
+sub serialize_list {
+   my ( $self, @args ) = @_;
+   return unless @args;
+
+   return $args[0] if @args == 1 && !defined $args[0];
+
+   die "Cannot serialize multiple values with undef/NULL"
+      if grep { !defined $_ } @args;
+
+   return join ',', map { quotemeta } @args;
+}
+
+sub deserialize_list {
+   my ( $self, $string ) = @_;
+   return $string unless defined $string;
+   my @escaped_parts = $string =~ /
+         \G             # Start of string, or end of previous match.
+         (              # Each of these is an element in the original list.
+            [^\\,]*     # Anything not a backslash or a comma
+            (?:         # When we get here, we found one of the above.
+               \\.      # A backslash followed by something so we can continue
+               [^\\,]*  # Same as above.
+            )*          # Repeat zero of more times.
+         )
+         ,              # Comma dividing elements
+      /sxgc;
+
+   push @escaped_parts, pos($string) ? substr( $string, pos($string) ) : $string;
+
+   my @unescaped_parts = map {
+      my $part = $_;
+
+      my $char_class = utf8::is_utf8($part)  # If it's a UTF-8 string,
+                     ? qr/(?=\p{ASCII})\W/   # We only care about non-word
+                     : qr/(?=\p{ASCII})\W|[\x{80}-\x{FF}]/; # Otherwise,
+      $part =~ s/\\($char_class)/$1/g;
+      $part;
+   } @escaped_parts;
+
+   return @unescaped_parts;
+}
+
 1;
 }
 # ###########################################################################
@@ -1036,7 +1078,7 @@ sub _parse_size {
       $opt->{value} = ($pre || '') . $num;
    }
    else {
-      $self->save_error("Invalid size for --$opt->{long}");
+      $self->save_error("Invalid size for --$opt->{long}: $val");
    }
    return;
 }
@@ -1133,20 +1175,81 @@ sub new {
 
 sub parse {
    my ( $self, $str ) = @_;
-   my $result = sprintf('%03d%03d%03d', $str =~ m/(\d+)/g);
+   my @version_parts = $str =~ m/(\d+)/g;
+   @version_parts = map { $_ || 0 } @version_parts[0..2];
+   my $result = sprintf('%03d%03d%03d', @version_parts);
    PTDEBUG && _d($str, 'parses to', $result);
    return $result;
 }
 
+sub version_cmp {
+   my ($self, $dbh, $target, $cmp) = @_;
+   my $version = $self->version($dbh);
+   my $result;
+
+   if ( $cmp eq 'ge' ) {
+      $result = $self->{$dbh} ge $self->parse($target) ? 1 : 0;
+   }
+   elsif ( $cmp eq 'gt' ) {
+      $result = $self->{$dbh} gt $self->parse($target) ? 1 : 0;
+   }
+   elsif ( $cmp eq 'eq' ) {
+      $result = $self->{$dbh} eq $self->parse($target) ? 1 : 0;
+   }
+   elsif ( $cmp eq 'ne' ) {
+      $result = $self->{$dbh} ne $self->parse($target) ? 1 : 0;
+   }
+   elsif ( $cmp eq 'lt' ) {
+      $result = $self->{$dbh} lt $self->parse($target) ? 1 : 0;
+   }
+   elsif ( $cmp eq 'le' ) {
+      $result = $self->{$dbh} le $self->parse($target) ? 1 : 0;
+   }
+   else {
+      die "Asked for an unknown comparizon: $cmp"
+   }
+
+   PTDEBUG && _d($self->{$dbh}, $cmp, $target, ':', $result);
+   return $result;
+}
+
 sub version_ge {
    my ( $self, $dbh, $target ) = @_;
+   return $self->version_cmp($dbh, $target, 'ge');
+}
+
+sub version_gt {
+   my ( $self, $dbh, $target ) = @_;
+   return $self->version_cmp($dbh, $target, 'gt');
+}
+
+sub version_eq {
+   my ( $self, $dbh, $target ) = @_;
+   return $self->version_cmp($dbh, $target, 'eq');
+}
+
+sub version_ne {
+   my ( $self, $dbh, $target ) = @_;
+   return $self->version_cmp($dbh, $target, 'ne');
+}
+
+sub version_lt {
+   my ( $self, $dbh, $target ) = @_;
+   return $self->version_cmp($dbh, $target, 'lt');
+}
+
+sub version_le {
+   my ( $self, $dbh, $target ) = @_;
+   return $self->version_cmp($dbh, $target, 'le');
+}
+
+sub version {
+   my ( $self, $dbh ) = @_;
    if ( !$self->{$dbh} ) {
       $self->{$dbh} = $self->parse(
          $dbh->selectrow_array('SELECT VERSION()'));
    }
-   my $result = $self->{$dbh} ge $self->parse($target) ? 1 : 0;
-   PTDEBUG && _d($self->{$dbh}, 'ge', $target, ':', $result);
-   return $result;
+   return $self->{$dbh};
 }
 
 sub innodb_version {
@@ -1487,7 +1590,7 @@ sub get_dbh {
          'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
       'Connection info:',      $dbh->{mysql_hostinfo},
       'Character set info:',   Dumper($dbh->selectall_arrayref(
-                     'SHOW VARIABLES LIKE "character_set%"', { Slice => {}})),
+                     "SHOW VARIABLES LIKE 'character_set%'", { Slice => {}})),
       '$DBD::mysql::VERSION:', $DBD::mysql::VERSION,
       '$DBI::VERSION:',        $DBI::VERSION,
    );
@@ -1822,7 +1925,7 @@ sub is_master_of {
       or die "The server specified as a slave is not a slave";
    my @connected     = $self->get_connected_slaves($master)
       or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array('SHOW VARIABLES LIKE "port"');
+   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
    if ( $port != $slave_status->{master_port} ) {
       die "The slave is connected to $slave_status->{master_port} "