Fix main test suite on Windows

3 files changed, 6 insertions, 26 deletions

diff --git a/mysql-test/r/lowercase_table4.result b/mysql-test/r/lowercase_table4.result
index aa81eff5194..02e2012a186 100644
--- a/mysql-test/r/lowercase_table4.result
+++ b/mysql-test/r/lowercase_table4.result
@@ -28,18 +28,7 @@ Create Table	CREATE TABLE `Table2` (
   KEY `fk1` (`c2`),
   CONSTRAINT `fk1` FOREIGN KEY (`c2`) REFERENCES `Table1` (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
-CONSTRAINT_CATALOG	def
-CONSTRAINT_SCHEMA	mysql
-CONSTRAINT_NAME	innodb_index_stats_ibfk_1
-UNIQUE_CONSTRAINT_CATALOG	def
-UNIQUE_CONSTRAINT_SCHEMA	mysql
-UNIQUE_CONSTRAINT_NAME	PRIMARY
-MATCH_OPTION	NONE
-UPDATE_RULE	RESTRICT
-DELETE_RULE	RESTRICT
-TABLE_NAME	innodb_index_stats
-REFERENCED_TABLE_NAME	innodb_table_stats
+SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_SCHEMA='test';
 CONSTRAINT_CATALOG	def
 CONSTRAINT_SCHEMA	test
 CONSTRAINT_NAME	fk1
@@ -98,18 +87,7 @@ Create Table	CREATE TABLE `Customer` (
   `Id` int(11) NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
-CONSTRAINT_CATALOG	def
-CONSTRAINT_SCHEMA	mysql
-CONSTRAINT_NAME	innodb_index_stats_ibfk_1
-UNIQUE_CONSTRAINT_CATALOG	def
-UNIQUE_CONSTRAINT_SCHEMA	mysql
-UNIQUE_CONSTRAINT_NAME	PRIMARY
-MATCH_OPTION	NONE
-UPDATE_RULE	RESTRICT
-DELETE_RULE	RESTRICT
-TABLE_NAME	innodb_index_stats
-REFERENCED_TABLE_NAME	innodb_table_stats
+SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_SCHEMA='test';
 CONSTRAINT_CATALOG	def
 CONSTRAINT_SCHEMA	test
 CONSTRAINT_NAME	product_order_ibfk_1
diff --git a/mysql-test/t/lowercase_table4.test b/mysql-test/t/lowercase_table4.test
index 3758ab62214..d13b1a16be1 100644
--- a/mysql-test/t/lowercase_table4.test
+++ b/mysql-test/t/lowercase_table4.test
@@ -72,7 +72,7 @@ CREATE TABLE `Table1`(c1 INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE `Table2`(c1 INT PRIMARY KEY, c2 INT) ENGINE=InnoDB;

 ALTER TABLE `Table2` ADD CONSTRAINT fk1 FOREIGN KEY(c2) REFERENCES `Table1`(c1);

 query_vertical SHOW CREATE TABLE `Table2`;

-query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;

+query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_SCHEMA='test';

 DROP TABLE `Table2`;

 DROP TABLE `Table1`;

 

@@ -101,7 +101,7 @@ CREATE TABLE Product_Order (No INT NOT NULL AUTO_INCREMENT,
 query_vertical SHOW CREATE TABLE Product_Order;

 query_vertical SHOW CREATE TABLE Product;

 query_vertical SHOW CREATE TABLE Customer;

-query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;

+query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_SCHEMA='test';

 DROP TABLE Product_Order;

 DROP TABLE Product;

 DROP TABLE Customer;

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 313366c7792..ef8115f8407 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4631,7 +4631,9 @@ bool create_table_impl(THD *thd,
   }
 #endif /* WITH_PARTITION_STORAGE_ENGINE */
 
+#ifdef HAVE_READLINK
   if (thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE)
+#endif
   {
     if (create_info->data_file_name)
       push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,