diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-04-01 15:25:06 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-04-01 15:25:06 +0400 |
| commit | 60e905a9b831c0d9eacafe88324687de2d82ea06 (patch) | |
| tree | ae3c553cd16673d14961b6a2ed49fd7fa3571cd2 /mysql-test/suite/innodb/t/innodb-index.test | |
| parent | aa58f7802c74e9fa0ceef1d7318b66a2094141e5 (diff) | |
| download | mariadb-git-60e905a9b831c0d9eacafe88324687de2d82ea06.tar.gz | |
Applying InnoDB snapshot
Detailed revision comments:
r6472 | calvin | 2010-01-16 01:53:47 +0200 (Sat, 16 Jan 2010) | 12 lines
branches/zip: Merge revisions 6425:6471 from branches/5.1
to pick up the first part fix of bug49396.
------------------------------------------------------------------------
r6471 | calvin | 2010-01-15 17:43:27 -0600 (Fri, 15 Jan 2010) | 4 lines
branches/5.1: fix bug#49396: main.innodb test fails in embedded mode
Change replace_result by using $MYSQLD_DATADIR. Tested in both embedded
mode and normal server mode.
------------------------------------------------------------------------
r6473 | calvin | 2010-01-16 01:58:16 +0200 (Sat, 16 Jan 2010) | 6 lines
branches/zip: fix bug#49396: innodb.innodb-index test fails in
embedded mode
This is 2nd part of the fix for bug#49396. The 1st part is
innodb.test. Tested in both embedded mode and normal server mode.
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-index.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-index.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test index b5dd2e037e7..09d6e2f8e3f 100644 --- a/mysql-test/suite/innodb/t/innodb-index.test +++ b/mysql-test/suite/innodb/t/innodb-index.test @@ -1,5 +1,7 @@ -- source include/have_innodb.inc +let $MYSQLD_DATADIR= `select @@datadir`; + let $innodb_file_format_check_orig=`select @@innodb_file_format_check`; create table t1(a int not null, b int, c char(10) not null, d varchar(20)) engine = innodb; @@ -146,7 +148,9 @@ delete from t1; --error ER_CANT_DROP_FIELD_OR_KEY drop index dc on t4; # there is no foreign key dc on t3 ---replace_regex /'\.\/test\/#sql2-[0-9a-f-]*'/'#sql2-temporary'/ +--replace_regex /'[^']*test\/#sql2-[0-9a-f-]*'/'#sql2-temporary'/ +# Embedded server doesn't chdir to data directory +--replace_result $MYSQLD_DATADIR ./ master-data/ '' --error ER_ERROR_ON_RENAME alter table t3 drop foreign key dc; alter table t4 drop foreign key dc; |