From 10a98a4992fd6f69959b8a490cfb19f91f85df4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 5 Jul 2017 17:22:53 +0300 Subject: [PATCH] Adjust a test for Windows On Windows, when tmpdir is not writable, there are only messages like this: 2017-07-05 14:04:25 3860 [ERROR] InnoDB: Unable to create temporary file; errno: 0 On other platforms, there would be two messages for each failure: 2017-07-05 17:23:02 140436573771648 [ERROR] mysqld: Can't create/write to file '/dev/null/nonexistent/ibaajU4U' (Errcode: 20 "Not a directory") 2017-07-05 17:23:02 140436573771648 [ERROR] InnoDB: Unable to create temporary file; errno: 20 --- mysql-test/suite/innodb/r/temporary_table.result | 1 - mysql-test/suite/innodb/t/temporary_table.test | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mysql-test/suite/innodb/r/temporary_table.result b/mysql-test/suite/innodb/r/temporary_table.result index 689d5a530d2..a6f2d28fc4a 100644 --- a/mysql-test/suite/innodb/r/temporary_table.result +++ b/mysql-test/suite/innodb/r/temporary_table.result @@ -137,7 +137,6 @@ Tables_in_test create temporary table t1 (keyc int, c1 char(100), c2 char(100)) engine = innodb; ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only") # test various bad start-up parameters -FOUND 3 /Can't create/write to file '.dev.null.nonexistent.ib/ in mysqld.1.err FOUND 3 /InnoDB: Unable to create temporary file/ in mysqld.1.err FOUND 1 /innodb_temporary and innodb_system file names seem to be the same/ in mysqld.1.err SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' diff --git a/mysql-test/suite/innodb/t/temporary_table.test b/mysql-test/suite/innodb/t/temporary_table.test index 45f84834edb..4184daaf064 100644 --- a/mysql-test/suite/innodb/t/temporary_table.test +++ b/mysql-test/suite/innodb/t/temporary_table.test @@ -10,7 +10,7 @@ --source include/no_valgrind_without_big.inc --disable_query_log -call mtr.add_suppression("Can't create/write to file '.dev.null.nonexistent.ib"); +call mtr.add_suppression("Can't create/write to file '/dev/null/nonexistent/ib"); call mtr.add_suppression("InnoDB: Unable to create temporary file"); call mtr.add_suppression("last file in setting innodb_temp_data_file_path"); call mtr.add_suppression("The table 't1' is full"); @@ -151,8 +151,6 @@ while ($mysql_errno) --enable_query_log --enable_result_log --disable_reconnect ---let SEARCH_PATTERN= Can't create/write to file '.dev.null.nonexistent.ib ---source include/search_pattern_in_file.inc --let SEARCH_PATTERN= InnoDB: Unable to create temporary file --source include/search_pattern_in_file.inc