summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-12-21 08:20:31 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-12-21 08:20:31 +0200
commit40f4525f43aba5d579cf55bae2df504001cd04f4 (patch)
treea2e3cd1310dd83cf9aa7ecc864286633a5b8470c /mysql-test
parent69e88de0fe6dc5312f5d6e7a179a5ab73d60dc43 (diff)
downloadmariadb-git-40f4525f43aba5d579cf55bae2df504001cd04f4.tar.gz
MDEV-14585: Adjust the innodb.innodb-alter-tempfile test case
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb/t/innodb-alter-tempfile.test14
1 files changed, 1 insertions, 13 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-alter-tempfile.test b/mysql-test/suite/innodb/t/innodb-alter-tempfile.test
index f2038da8c4c..f7635e96d50 100644
--- a/mysql-test/suite/innodb/t/innodb-alter-tempfile.test
+++ b/mysql-test/suite/innodb/t/innodb-alter-tempfile.test
@@ -32,24 +32,12 @@ SET debug_dbug='+d,innodb_alter_commit_crash_before_commit';
--error 2013
ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
-let TABLENAME_INC= $MYSQLTEST_VARDIR/tmp/tablename.inc;
-perl;
-die unless open OUT, ">$ENV{TABLENAME_INC}";
-chdir "$ENV{'datadir'}/test";
-my @frm_file = map { substr($_, 0, -4) } glob "#sql-*.frm";
-print OUT 'let $temp_table_name=', $frm_file[0], ';';
-close OUT or die;
-EOF
-source $TABLENAME_INC;
-remove_file $TABLENAME_INC;
+remove_files_wildcard $datadir/test #sql-*.frm;
--source include/start_mysqld.inc
show create table t1;
--echo # Consecutive Alter table does not create same temporary file name
ALTER TABLE t1 ADD PRIMARY KEY (f2, f1);
---disable_query_log
-eval DROP TABLE `#mysql50#$temp_table_name`;
---enable_query_log
show create table t1;
drop table t1;