database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Vladislav Vaintroub
2016-06-01 20:21:36 +02:00
parent 23fed78404
commit 22ede741f0
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/mysql-test-run.pl
View File

@@ -1854,11 +1854,17 @@ sub collect_mysqld_features {
$list =~ s/\n {22}(\S)/ $1/g; $list =~ s/\n {22}(\S)/ $1/g;
my @list= split '\n', $list; my @list= split '\n', $list;
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= 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; $mysql_version_id= $1*10000 + $2*100 + $3;
$mysql_version_extra= $4;
mtr_report("MariaDB Version $1.$2.$3$4"); mtr_report("MariaDB Version $1.$2.$3$4");
last;
}
}
mtr_error("Could not find version of MariaDB")
unless $mysql_version_id > 0;
for (@list) for (@list)
{ {

4
sql/table.h
View File

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