fix compile error - inconsistent use of 'struct' and 'class' for TDC_…

…element
MariaDB · Jun 1, 2016 · 22ede74 · 22ede74
1 parent 23fed78
commit 22ede74
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -1854,11 +1854,17 @@ sub collect_mysqld_features {
   $list =~ s/\n {22}(\S)/ $1/g;
 
   my @list= split '\n', $list;
+
+  $mysql_version_id= 0;
+  while (defined(my $line = shift @list)){
+     if ($line =~ /^\Q$exe_mysqld\E\s+Ver\s(\d+)\.(\d+)\.(\d+)(\S*)/ ) {
+      $mysql_version_id= $1*10000 + $2*100 + $3;
+      mtr_report("MariaDB Version $1.$2.$3$4");
+      last;
+    }
+  }
   mtr_error("Could not find version of MariaDB")
-     unless shift(@list) =~ /^\Q$exe_mysqld\E\s+Ver\s(\d+)\.(\d+)\.(\d+)(\S*)/;
-  $mysql_version_id= $1*10000 + $2*100 + $3;
-  $mysql_version_extra= $4;
-  mtr_report("MariaDB Version $1.$2.$3$4");
+     unless $mysql_version_id > 0;
 
   for (@list)
   {

diff --git a/sql/table.h b/sql/table.h
@@ -49,7 +49,7 @@ class ACL_internal_table_access;
 class Field;
 class Table_statistics;
 class With_element;
-class TDC_element;
+struct TDC_element;
 
 /*
   Used to identify NESTED_JOIN structures within a join (applicable only to
@@ -1013,7 +1013,7 @@ struct TABLE
      One should use methods of I_P_List template instead.
   */
   TABLE *share_all_next, **share_all_prev;
-  friend class TDC_element;
+  friend struct TDC_element;
 
 public: