Updated --expose_dd_tables procedure to deal with DD changes in 8.0.2

datacharmer · Jul 24, 2017 · 724d174 · 724d174
1 parent a3d6e43
commit 724d174
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,5 @@
+3.2.13	24-Jul-2017
+	- Updated --expose_dd_tables procedure to deal with DD changes in 8.0.2
 3.2.12	18-Jul-2017
 	- Changed initial check for system tables: MySQL 8.0.2 has a tablespace instead
 3.2.11	16-Jul-2017

diff --git a/bin/low_level_make_sandbox b/bin/low_level_make_sandbox
@@ -180,10 +180,15 @@ if ($msb->{options}{expose_dd_tables})
         $msb->{options}{post_grants_sql} = ''; 
     }
 
+    # In MySQL 8.0.2 the "hidden" column was changed from integer (0=visible, 1=hidden)
+    # to an ENUM (System, Visible, SE, DDL)
     $msb->{options}{post_grants_sql} = 
             "set persist debug='+d,skip_dd_table_access_check';
-            create table sys.dd_hidden_tables select id, name, schema_id from mysql.tables where hidden=1;
-            update mysql.tables set hidden=0 where hidden=1;
+            set \@col_type=(select c.type from mysql.columns c inner join mysql.tables t where t.id=table_id and t.name='tables' and c.name='hidden');
+            set \@visible=(if(\@col_type = 'MYSQL_TYPE_ENUM', 'Visible', '0'));
+            set \@hidden=(if(\@col_type = 'MYSQL_TYPE_ENUM', 'System', '1'));
+            create table sys.dd_hidden_tables select id, name, schema_id from mysql.tables where hidden=\@hidden;
+            update mysql.tables set hidden=\@visible where hidden=\@hidden and schema_id = 1;
             "
             . $msb->{options}{post_grants_sql}; 
 }

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.12};
+our $VERSION=q{3.2.13};
 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.12};
+our $VERSION=q{3.2.13};
 
 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.12};
+our $VERSION=q{3.2.13};
 
 our @MANIFEST = (
 'clear.sh',

diff --git a/test_all_latest.sh b/test_all_latest.sh
@@ -25,6 +25,7 @@ do
     if [ "$?" != "0" ] ; then continue ; fi
     make 
     if [ "$?" != "0" ] ; then continue ; fi
+    date
     TEST_VERSION=$V make test 
     EC=$? 
     echo "`date` - $V - $EC" >> results.txt