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

Fix for a bug when backporting/merging Bug#36573

Browse Source
This commit is contained in:
Magne Mahre 2009-11-26 13:47:55 +01:00
parent 3be9052153
commit eea7af04c0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/myisampack.result
View File

@ -115,7 +115,8 @@ ERROR 42S02: Table 'test.t3' doesn't exist
# ===== myisampack.4 =====
#Tests the myisampack join operation with an existing destination .frm,.MYI,.MDI
#the command should fail with exit status 2
/data/z/mysql-next-mr-runtime/mysql-test/var/mysqld.1/data//master-data/test/t1 gave error 2 on open
myisampack: Can't create/write to file (Errcode: 17)
Aborted: file is not compressed
DROP TABLE t1,t2,t3;
DROP TABLE mysql_db1.t1;
DROP DATABASE mysql_db1;

2
mysql-test/t/myisampack.test
View File

@ -214,7 +214,7 @@ SELECT COUNT(a) FROM t3;
#
--replace_regex /.*myisampack(\.exe)?: Can't create\/write to file .*\(/myisampack: Can't create\/write to file (/ /Aborted: .*is/Aborted: file is/
--error 2
--exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/master-data/test/t1 $MYSQLD_DATADIR/test/t2 2>&1
--exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/test/t1 $MYSQLD_DATADIR/test/t2 2>&1
DROP TABLE t1,t2,t3;