Fixed error in --custom_mysqld handling

datacharmer · May 3, 2017 · f96bbaa · f96bbaa
1 parent c7cda28
commit f96bbaa
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,5 @@
+3.2.10	03-May-2017
+	- Fixed error in --custom_mysqld handling
 3.2.09	01-May-2017
 	- Merged Guriandoro's change to check port numbers in change_ports
 	- Added change directory command to change_ports

diff --git a/bin/low_level_make_sandbox b/bin/low_level_make_sandbox
@@ -161,7 +161,6 @@ else
     die "# Can't get MySQL version from mysql_config\n";
 }
 
-$msb->{options}{custom_mysqld} = '';
 if ($msb->{options}{expose_dd_tables})
 {
     my $mysql_version = $msb->{options}{detected_mysql_version};

diff --git a/lib/MySQL/Sandbox.pm b/lib/MySQL/Sandbox.pm
@@ -30,7 +30,7 @@ our @EXPORT_OK= qw( is_port_open
                     split_version
                     ) ;
 
-our $VERSION=q{3.2.09};
+our $VERSION=q{3.2.10};
 our $DEBUG;
 
 BEGIN {

diff --git a/lib/MySQL/Sandbox/Recipes.pm b/lib/MySQL/Sandbox/Recipes.pm
@@ -3,7 +3,7 @@ package MySQL::Sandbox::Recipes;
 use strict;
 use warnings;
 
-our $VERSION=q{3.2.09};
+our $VERSION=q{3.2.10};
 
 1;
 __END__

diff --git a/lib/MySQL/Sandbox/Scripts.pm b/lib/MySQL/Sandbox/Scripts.pm
@@ -17,7 +17,7 @@ our @EXPORT_OK = qw(
     );
 our @EXPORT = @EXPORT_OK;
 
-our $VERSION=q{3.2.09};
+our $VERSION=q{3.2.10};
 
 our @MANIFEST = (
 'clear.sh',
@@ -448,8 +448,8 @@ my %parse_options_low_level_make_sandbox = (
                                          ]
                             },
     custom_mysqld => {
-                                value => $ENV{'CUSTOM_MYSQLD'},      
-                                parse => 'custom_mysqld', 
+                                value => $ENV{'CUSTOM_MYSQLD'} || '' , 
+                                parse => 'custom_mysqld=s', 
                                 so    => 198,
                                 export => 1,
                                 help  => [

diff --git a/t/dd_expose.sb.pl b/t/dd_expose.sb.pl
@@ -13,8 +13,10 @@ sub test_run
 {
     my ($tests) = @_;
     ok_exec({
-        command     =>  "make_sandbox $TEST_VERSION -- --no_confirm --sandbox_directory=$install_dir --expose_dd_tables "
-                       . "--sandbox_port=$install_port ",
+        command     =>  "make_sandbox $TEST_VERSION -- "
+                       . "--no_confirm --sandbox_directory=$install_dir"
+                       . "  --expose_dd_tables "
+                       . " --sandbox_port=$install_port ",
         expected    => 'sandbox server started' ,
         msg         => 'sandbox server started',
     });
@@ -52,7 +54,9 @@ sub test_run
         msg  => 'table "mysql.tables" is readable'
     },
     {
-        query   => "select count(*) from mysql.tables where name='dd_hidden_tables' and schema_id = (select id from mysql.schemata where name='sys')",
+        query   =>   "select count(*) from mysql.tables "
+                   . " where name='dd_hidden_tables' "
+                   . " and schema_id = (select id from mysql.schemata where name='sys')",
         expected => '1',
         msg  => 'table "sys.dd_hidden_tables" exists'
     }