PT-1795 Updated MySQL flavor detection

bin/pt-archiver

@@ -2763,8 +2763,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -2862,8 +2860,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-deadlock-logger

@@ -1879,8 +1879,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -1978,8 +1976,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-heartbeat

@@ -5737,8 +5737,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-online-schema-change

@@ -2039,8 +2039,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-slave-find

@@ -3278,8 +3278,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -3377,8 +3375,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-slave-restart

@@ -2029,8 +2029,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -2128,8 +2126,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-table-checksum

@@ -4237,8 +4237,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -4336,8 +4334,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-table-sync

@@ -2490,8 +2490,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -2589,8 +2587,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-table-usage

@@ -3663,8 +3663,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -3762,8 +3760,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-upgrade

@@ -5132,8 +5132,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -5231,8 +5229,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

bin/pt-variable-advisor

@@ -2330,8 +2330,6 @@ use overload (
 
 use Carp ();
 
-our $VERSION = 0.01;
-
 has major => (
     is       => 'ro',
     isa      => 'Int',
@@ -2429,8 +2427,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);

lib/VersionParser.pm

@@ -144,8 +144,12 @@ sub BUILDARGS {
          if ( $query ) {
             $query = { map { $_->{variable_name} => $_->{value} } @$query };
             @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
+            $args{flavor} = delete $query->{version_comment} if $query->{version_comment};
-                  if $query->{version_comment};
+            if ($args{flavor} !~ m/mysql|maria|percona/i) {
+                eval {
+                    ($args{flavor}) = $dbh->selectrow_array(q/SELECT VERSION()/);
+                };
+            }
          }
          elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
             @args{@methods} = $self->_split_version($query);