summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/bdb.result2
-rw-r--r--mysql-test/r/innodb.result6
-rw-r--r--mysql-test/r/isam.result6
-rw-r--r--mysql-test/r/repair_part1.result2
-rw-r--r--sql/share/english/errmsg.txt2
5 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index b0566011996..fd2f7b7e49b 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -203,7 +203,7 @@ a
2
check table t1;
Table Op Msg_type Msg_text
-test.t1 check error The storage enginge for the table doesn't support check
+test.t1 check error The storage engine for the table doesn't support check
drop table t1;
create table t1 (a int,b varchar(20)) type=bdb;
insert into t1 values (1,""), (2,"testing");
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 4d5a6094ec3..f80f9644e5a 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -156,7 +156,7 @@ level id parent_id
1 1007 101
optimize table t1;
Table Op Msg_type Msg_text
-test.t1 optimize error The storage enginge for the table doesn't support optimize
+test.t1 optimize error The storage engine for the table doesn't support optimize
show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 id A # NULL NULL BTREE
@@ -180,7 +180,7 @@ create table t1 (a int) type=innodb;
insert into t1 values (1), (2);
optimize table t1;
Table Op Msg_type Msg_text
-test.t1 optimize error The storage enginge for the table doesn't support optimize
+test.t1 optimize error The storage engine for the table doesn't support optimize
delete from t1 where a = 1;
select * from t1;
a
@@ -712,7 +712,7 @@ world 2
hello 1
optimize table t1;
Table Op Msg_type Msg_text
-test.t1 optimize error The storage enginge for the table doesn't support optimize
+test.t1 optimize error The storage engine for the table doesn't support optimize
show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 a A 2 NULL NULL BTREE
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result
index 5ac54668443..b83185b0c01 100644
--- a/mysql-test/r/isam.result
+++ b/mysql-test/r/isam.result
@@ -57,14 +57,14 @@ test.t1 optimize status OK
check table t1,t2;
Table Op Msg_type Msg_text
test.t1 check status OK
-test.t2 check error The storage enginge for the table doesn't support check
+test.t2 check error The storage engine for the table doesn't support check
repair table t1,t2;
Table Op Msg_type Msg_text
test.t1 repair status OK
-test.t2 repair error The storage enginge for the table doesn't support repair
+test.t2 repair error The storage engine for the table doesn't support repair
check table t2,t1;
Table Op Msg_type Msg_text
-test.t2 check error The storage enginge for the table doesn't support check
+test.t2 check error The storage engine for the table doesn't support check
test.t1 check status OK
lock tables t1 write;
check table t2,t1;
diff --git a/mysql-test/r/repair_part1.result b/mysql-test/r/repair_part1.result
index eb46622dcc1..27dfdac24f0 100644
--- a/mysql-test/r/repair_part1.result
+++ b/mysql-test/r/repair_part1.result
@@ -7,7 +7,7 @@ test.t1 repair status OK
alter table t1 TYPE=HEAP;
repair table t1 use_frm;
Table Op Msg_type Msg_text
-test.t1 repair error The storage enginge for the table doesn't support repair
+test.t1 repair error The storage engine for the table doesn't support repair
drop table t1;
repair table t1 use_frm;
Table Op Msg_type Msg_text
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 57336647f2a..11ae2c89019 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -179,7 +179,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
"Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table",
-"The storage enginge for the table doesn't support %s",
+"The storage engine for the table doesn't support %s",
"You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT",
"Got error %d during ROLLBACK",