Skip to content

Commit ab48901

Browse files
ottokgrooverdan
authored andcommitted
Fix spelling errors
1 parent 05fa455 commit ab48901

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

mysql-test/suite/maria/maria-connect.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
1111
show warnings;
1212
Level Code Message
1313
Error 1062 Duplicate entry '2' for key 'PRIMARY'
14-
Note 4173 Engine Aria does not support rollback. Changes where commited during rollback call
14+
Note 4173 Engine Aria does not support rollback. Changes where committed during rollback call
1515
Warning 1196 Some non-transactional changed tables couldn't be rolled back
1616
select * from t1;
1717
a

sql/mdl.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ void MDL_ticket::destroy(MDL_ticket *ticket)
10351035

10361036
/**
10371037
Return the 'weight' of this ticket for the
1038-
victim selection algorithm. Requests with
1038+
victim selection algorithm. Requests with
10391039
lower weight are preferred to requests
10401040
with higher weight when choosing a victim.
10411041
*/
@@ -2179,7 +2179,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
21792179
to wait for another thread which is not ready to commit.
21802180
This is always an error, as the upper level of parallel replication
21812181
should not allow a scheduling of a conflicting DDL until all earlier
2182-
transactions has commited.
2182+
transactions have been committed.
21832183
21842184
This function is only called for a slave using parallel replication
21852185
and trying to get an exclusive lock for the table.

sql/share/errmsg-utf8.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7964,4 +7964,4 @@ ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS
79647964
ER_NOT_ALLOWED_IN_THIS_CONTEXT
79657965
eng "'%-.128s' is not allowed in this context"
79667966
ER_DATA_WAS_COMMITED_UNDER_ROLLBACK
7967-
eng "Engine %s does not support rollback. Changes where commited during rollback call"
7967+
eng "Engine %s does not support rollback. Changes where committed during rollback call"

sql/sql_help.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, size_t mlen,
671671
672672
RETURN VALUES
673673
FALSE Success
674-
TRUE Error and send_error already commited
674+
TRUE Error and send_error already committed
675675
*/
676676

677677
static bool mysqld_help_internal(THD *thd, const char *mask)

0 commit comments

Comments
 (0)