summaryrefslogtreecommitdiff
path: root/mysql-test/t/myisampack.test
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2009-11-25 20:22:45 +0100
committerMagne Mahre <magne.mahre@sun.com>2009-11-25 20:22:45 +0100
commit0b8696591aa7516d3f87ffb7de5a4201c27c81f3 (patch)
treead4b737cb62972680806f7fbf9f7aaa12d49d76e /mysql-test/t/myisampack.test
parent952f8bda788133a12ab51600c3e42617b5c10664 (diff)
downloadmariadb-git-0b8696591aa7516d3f87ffb7de5a4201c27c81f3.tar.gz
Addition to BUG#36573 - myisampack --join does not create destination table
.frm file Added FLUSH TABLES before myisampack --join operation to fix the test warnings or errors Removed unused variable in create_dest_frm() method
Diffstat (limited to 'mysql-test/t/myisampack.test')
-rw-r--r--mysql-test/t/myisampack.test6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/myisampack.test b/mysql-test/t/myisampack.test
index 38197980c6f..6f1ac24a507 100644
--- a/mysql-test/t/myisampack.test
+++ b/mysql-test/t/myisampack.test
@@ -124,7 +124,7 @@ let $i=9;
--disable_query_log
while ($i)
{
- INSERT INTO t1 SELECT ROUND(a * RAND() * 10) from t1;
+ INSERT INTO t1 SELECT a from t1;
dec $i;
}
--enable_query_log
@@ -136,11 +136,12 @@ let $i=9;
--disable_query_log
while ($i)
{
- INSERT INTO t2 SELECT ROUND(a * RAND() * 10) from t2;
+ INSERT INTO t2 SELECT a from t2;
dec $i;
}
--enable_query_log
+FLUSH TABLE t1,t2;
--exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/test/t1 $MYSQLD_DATADIR/test/t2 2>&1
--echo #If the myisampack --join operation is successful, we have table t3(.frm)
@@ -153,6 +154,7 @@ SELECT COUNT(a) FROM t3;
# It should finish the join operation successfully
#############################################################################
--echo # ===== myisampack.2 =====
+FLUSH TABLE t3;
--remove_file $MYSQLD_DATADIR/test/t3.MYI
--remove_file $MYSQLD_DATADIR/test/t3.MYD
--exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/test/t1 $MYSQLD_DATADIR/test/t2 2>&1