summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@seravo.fi>2016-03-04 02:09:37 +0200
committerOtto Kekäläinen <otto@seravo.fi>2016-03-04 02:09:37 +0200
commit1777fd5f556a9c68cae01ad2aadaf4865984e649 (patch)
tree931f4a045467951a6ef8833631d6f0aeb04b53c3 /mysql-test/t/merge.test
parentf8251911a44f6b65c2377e9945e208e240dfec33 (diff)
downloadmariadb-git-1777fd5f556a9c68cae01ad2aadaf4865984e649.tar.gz
Fix spelling: occurred, execute, which etc
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 2697e3b9a5f..77e896c7c05 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -655,7 +655,7 @@ insert into t1 values (1);
flush tables;
# Open t2 and (implicitly) t1.
select * from t2;
-# Truncate t1, wich was not recognized as open without the bugfix.
+# Truncate t1, which was not recognized as open without the bugfix.
# After fix for Bug#8306 and before fix for Bug#26379,
# it should fail with a table-in-use error message, otherwise succeed.
truncate table t1;