mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust a test for Windows

Browse source 
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
This commit is contained in:
Marko Mäkelä 2017-07-05 17:22:53 +03:00
parent 4f93c732d5
commit 10a98a4992
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/innodb/r/temporary_table.result
View file

@ -137,7 +137,6 @@ Tables_in_test
create temporary table t1 (keyc int, c1 char(100), c2 char(100)) engine = innodb; 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") ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only")
# test various bad start-up parameters # 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 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 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' SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb'

4
mysql-test/suite/innodb/t/temporary_table.test
View file

@ -10,7 +10,7 @@
--source include/no_valgrind_without_big.inc --source include/no_valgrind_without_big.inc
--disable_query_log --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("InnoDB: Unable to create temporary file");
call mtr.add_suppression("last file in setting innodb_temp_data_file_path"); call mtr.add_suppression("last file in setting innodb_temp_data_file_path");
call mtr.add_suppression("The table 't1' is full"); call mtr.add_suppression("The table 't1' is full");
@ -151,8 +151,6 @@ while ($mysql_errno)
--enable_query_log --enable_query_log
--enable_result_log --enable_result_log
--disable_reconnect --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 --let SEARCH_PATTERN= InnoDB: Unable to create temporary file
--source include/search_pattern_in_file.inc --source include/search_pattern_in_file.inc