1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post push fix for merge.test and mysqlcheck.test on windows

Browse Source
This commit is contained in:
Mattias Jonsson 2011-12-15 16:59:18 +01:00
parent 65fbeccd23
commit e5cb287933
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/mysqlcheck.result
View File

@ -147,6 +147,7 @@ DROP TABLE `@`;
CREATE TABLE `я` (a INT); CREATE TABLE `я` (a INT);
SET NAMES DEFAULT; SET NAMES DEFAULT;
mysqlcheck --default-character-set="latin1" --databases test mysqlcheck --default-character-set="latin1" --databases test
call mtr.add_suppression("Can't find file: '..test.@003f.frm'");
test.? test.?
Error : Table doesn't exist Error : Table doesn't exist
status : Operation failed status : Operation failed

10
mysql-test/t/merge.test
View File

@ -1817,9 +1817,13 @@ CREATE TABLE t1(a INT);
--echo # Test reattach merge failure --echo # Test reattach merge failure
LOCK TABLES m1 READ; LOCK TABLES m1 READ;
--echo # Replace 't1' with 't3' table using file operations. --echo # Replace 't1' with 't3' table using file operations.
remove_file $MYSQLD_DATADIR/test/t1.frm; # move + remove is a work around for windows.
remove_file $MYSQLD_DATADIR/test/t1.MYI; move_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/oldt1.frm;
remove_file $MYSQLD_DATADIR/test/t1.MYD; move_file $MYSQLD_DATADIR/test/t1.MYI $MYSQLD_DATADIR/test/oldt1.MYI;
move_file $MYSQLD_DATADIR/test/t1.MYD $MYSQLD_DATADIR/test/oldt1.MYD;
remove_file $MYSQLD_DATADIR/test/oldt1.frm;
remove_file $MYSQLD_DATADIR/test/oldt1.MYI;
remove_file $MYSQLD_DATADIR/test/oldt1.MYD;
copy_file $MYSQLD_DATADIR/test/t3.frm $MYSQLD_DATADIR/test/t1.frm; copy_file $MYSQLD_DATADIR/test/t3.frm $MYSQLD_DATADIR/test/t1.frm;
copy_file $MYSQLD_DATADIR/test/t3.MYI $MYSQLD_DATADIR/test/t1.MYI; copy_file $MYSQLD_DATADIR/test/t3.MYI $MYSQLD_DATADIR/test/t1.MYI;
copy_file $MYSQLD_DATADIR/test/t3.MYD $MYSQLD_DATADIR/test/t1.MYD; copy_file $MYSQLD_DATADIR/test/t3.MYD $MYSQLD_DATADIR/test/t1.MYD;

1
mysql-test/t/mysqlcheck.test
View File

@ -138,6 +138,7 @@ CREATE TABLE `я` (a INT);
SET NAMES DEFAULT; SET NAMES DEFAULT;
--echo mysqlcheck --default-character-set="latin1" --databases test --echo mysqlcheck --default-character-set="latin1" --databases test
# Error returned depends on platform, replace it with "Table doesn't exist" # Error returned depends on platform, replace it with "Table doesn't exist"
call mtr.add_suppression("Can't find file: '..test.@003f.frm'");
--replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist" --replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist"
--exec $MYSQL_CHECK --default-character-set="latin1" --databases test --exec $MYSQL_CHECK --default-character-set="latin1" --databases test
--echo mysqlcheck --default-character-set="utf8" --databases test --echo mysqlcheck --default-character-set="utf8" --databases test