Adapted MySQL-Sandbox to new default users

- Changed grants to support new users changes in 5.7.19 and 8.0.4
  (mysql.session, mysql.infoschema)
- Improved tests to deal with new default users

Author: datacharmer

Changelog

@@ -1,3 +1,6 @@
+3.2.15	18-Nov-2017
+	- Changed grants to support new users in 5.7.19 and 8.0.4
+	- Improved tests to deal with new default users
 3.2.14	05-Sep-2017
 	- Added a conditional delay in ./use, as a temporary workaround for
 	  changed replication defaults in MySQL 8.0.x.

lib/MySQL/Sandbox.pm

@@ -31,7 +31,7 @@ our @EXPORT_OK= qw( is_port_open
                     split_version
                     ) ;
 
-our $VERSION=q{3.2.14};
+our $VERSION=q{3.2.15};
 our $DEBUG;
 
 BEGIN {

lib/MySQL/Sandbox/Recipes.pm

@@ -3,7 +3,7 @@ package MySQL::Sandbox::Recipes;
 use strict;
 use warnings;
 
-our $VERSION=q{3.2.14};
+our $VERSION=q{3.2.15};
 
 1;
 __END__

lib/MySQL/Sandbox/Scripts.pm

@@ -17,7 +17,7 @@ our @EXPORT_OK = qw(
     );
 our @EXPORT = @EXPORT_OK;
 
-our $VERSION=q{3.2.14};
+our $VERSION=q{3.2.15};
 
 our @MANIFEST = (
 'clear.sh',
@@ -1795,7 +1795,7 @@ set password='_DBPASSWORD_';
 -- delete from tables_priv;
 -- delete from columns_priv;
 -- delete from db;
-delete from user where user not in ('root', 'mysql.sys', 'mysqlxsys');
+delete from user where user not in ('root', 'mysql.sys', 'mysqlxsys', 'mysql.session', 'mysql.infoschema');
 
 flush privileges;
 

t/Test_Helper.pm

@@ -31,6 +31,15 @@ BEGIN {
         }
     }
     $test_version = $ENV{TEST_VERSION} ;
+    my ($major, $minor, $rev) = split_version($test_version);
+    my $compare_test = sprintf("%05d-%05d-%05d", $major,  $minor,  $rev);
+    my $ver_8_0_3 = sprintf("%05d-%05d-%05d", 8, 0, 3);
+    # Adds delay to 8.0.3+
+    if ( ( $major != 10 ) && ($compare_test ge $ver_8_0_3) )
+    {
+       $ENV{TEST_REPL_DELAY} = 2;
+    }
+
 };
 
 use strict;
@@ -66,7 +75,6 @@ sub skip_version
 sub confirm_version
 {
     my ($min_version, $max_version) = @_;
-    my $will_skip =0;
     my ($major, $minor, $rev) = split_version($test_version);
     my ($major1, $minor1, $rev1) = split_version($min_version);
     my ($major2, $minor2, $rev2) = split_version($max_version);

t/user_privileges.sb.pl

@@ -32,6 +32,22 @@
    $number_of_users = 9;
 }
 
+if (
+    ( ($major ==5) && ($minor == 7) && ($rev >= 19))
+     or
+    ( ($major ==8) && ($minor == 0) && ($rev >= 3))
+   )
+# Starting with MySQL 5.7.19 we have the mysql.session user created by default.
+{
+   $number_of_users = 10;
+}
+
+# Starting with MySQL 8.0.4 we have also users mysql.session and
+# mysql.infoschema created by default.
+if  (($major ==8) &&  ($minor == 0)  && ($rev > 3))
+{
+    $number_of_users = 11;
+}
 ok_exec({
 command  => "make_sandbox $TEST_VERSION -- --no_confirm --sandbox_directory=msb_XXXX",
 expected => "sandbox server started",