diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-10 15:43:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-10 15:43:57 +0200 |
| commit | ff3407a111ec268e7bd5e726a75527089871c914 (patch) | |
| tree | 88873db866d8b00b57d11d2cd2a15c1d6a03c6aa /mysql-test/suite/archive | |
| parent | 3ed6b24d820edbee3bc333c726dd0aa66c015b56 (diff) | |
| download | mariadb-git-ff3407a111ec268e7bd5e726a75527089871c914.tar.gz | |
portability fixes for mysql-test
mysql-test/r/mysqld--help.result:
that's default to number of CPUs
mysql-test/suite/archive/discover.test:
move_file uses rename(2), which may end up
with "Invalid cross-device link"
mysql-test/suite/archive/partition_archive.test:
on Solaris the error message is different
Diffstat (limited to 'mysql-test/suite/archive')
| -rw-r--r-- | mysql-test/suite/archive/discover.test | 4 | ||||
| -rw-r--r-- | mysql-test/suite/archive/partition_archive.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/archive/discover.test b/mysql-test/suite/archive/discover.test index 75668baafbf..0b7e521185d 100644 --- a/mysql-test/suite/archive/discover.test +++ b/mysql-test/suite/archive/discover.test @@ -53,7 +53,9 @@ rename table t2 to t0; --echo # copy_file $mysqld_datadir/test/t1.ARZ $MYSQL_TMP_DIR/t1.ARZ; alter table t1 modify a int default 5; -move_file $MYSQL_TMP_DIR/t1.ARZ $mysqld_datadir/test/t1.ARZ; +remove_file $mysqld_datadir/test/t1.ARZ; +copy_file $MYSQL_TMP_DIR/t1.ARZ $mysqld_datadir/test/t1.ARZ; +remove_file $MYSQL_TMP_DIR/t1.ARZ; show create table t1; --echo # diff --git a/mysql-test/suite/archive/partition_archive.test b/mysql-test/suite/archive/partition_archive.test index e4cc39ff097..be2abeada73 100644 --- a/mysql-test/suite/archive/partition_archive.test +++ b/mysql-test/suite/archive/partition_archive.test @@ -47,7 +47,7 @@ engine=archive partition by list (a) (partition p0 values in (1), partition p1 values in (2)); insert into t1 values (1), (2); ---replace_regex /#sql-[0-9a-f_]+/#sql-temporary/ +--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/ /Not owner/Operation not permitted/ --error ER_CANT_CREATE_TABLE create index inx on t1 (a); alter table t1 add partition (partition p2 values in (3)); |