summaryrefslogtreecommitdiff
path: root/mysql-test/t/partition_disabled.test
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@sun.com>2009-08-12 12:03:05 +0200
committerMattias Jonsson <mattias.jonsson@sun.com>2009-08-12 12:03:05 +0200
commitabc73040b51372ad8390604da6b88a76c6bcd1fb (patch)
treef460aa465ae53a1bd1b76d6f4cf144dd0a6957dc /mysql-test/t/partition_disabled.test
parentf09fc5000413a4daaa401997968fc8f13def2f2c (diff)
parentdd10de57d37ccc82bad16f451aa4c8db91e694c2 (diff)
downloadmariadb-git-abc73040b51372ad8390604da6b88a76c6bcd1fb.tar.gz
manual merge
Diffstat (limited to 'mysql-test/t/partition_disabled.test')
-rw-r--r--mysql-test/t/partition_disabled.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/partition_disabled.test b/mysql-test/t/partition_disabled.test
index 2f068b8c3cc..320d6238502 100644
--- a/mysql-test/t/partition_disabled.test
+++ b/mysql-test/t/partition_disabled.test
@@ -15,7 +15,7 @@ let $MYSQLD_DATADIR= `SELECT @@datadir`;
# Bug#39893: Crash if select on a partitioned table,
# when partitioning is disabled
FLUSH TABLES;
---copy_file $MYSQLTEST_VARDIR/std_data_ln/parts/t1.frm $MYSQLD_DATADIR/test/t1.frm
+--copy_file $MYSQLTEST_VARDIR/std_data/parts/t1.frm $MYSQLD_DATADIR/test/t1.frm
SELECT * FROM t1;
TRUNCATE TABLE t1;
ANALYZE TABLE t1;