summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <tsmith@ramayana.hindu.god>2008-01-25 16:02:41 -0700
committerunknown <tsmith@ramayana.hindu.god>2008-01-25 16:02:41 -0700
commit8b31459174013bc9f52e5b283a3dd616061a242f (patch)
tree848f0917a3c18ff3ea23f3b09cea530223410d83 /mysql-test
parentaa4f8572118399b54f69cd1baca1dcacfd4c3254 (diff)
parent9dbd3877b5eb48b5a252dedbbbc61a722324e782 (diff)
downloadmariadb-git-8b31459174013bc9f52e5b283a3dd616061a242f.tar.gz
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/t/mysqlcheck.test: Manual merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/mysqlcheck.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 58d6aef1b90..ba13a315cb8 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -57,7 +57,7 @@ insert into t_bug25347 values (1),(2),(3);
flush tables;
--echo removing and creating
--remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
---write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI EOF
+--write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
EOF
--exec $MYSQL_CHECK --repair --databases d_bug25347
--error 130