diff options
| -rw-r--r-- | mysql-test/suite/maria/maria-connect.result | 2 | ||||
| -rw-r--r-- | sql/mdl.cc | 4 | ||||
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 | ||||
| -rw-r--r-- | sql/sql_help.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/maria/maria-connect.result b/mysql-test/suite/maria/maria-connect.result index 76e30d7d136..5c8b5524d69 100644 --- a/mysql-test/suite/maria/maria-connect.result +++ b/mysql-test/suite/maria/maria-connect.result @@ -11,7 +11,7 @@ ERROR 23000: Duplicate entry '2' for key 'PRIMARY' show warnings; Level Code Message Error 1062 Duplicate entry '2' for key 'PRIMARY' -Note 4173 Engine Aria does not support rollback. Changes where commited during rollback call +Note 4173 Engine Aria does not support rollback. Changes where committed during rollback call Warning 1196 Some non-transactional changed tables couldn't be rolled back select * from t1; a diff --git a/sql/mdl.cc b/sql/mdl.cc index 6cdea8c3ebd..4772dc017f9 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1035,7 +1035,7 @@ void MDL_ticket::destroy(MDL_ticket *ticket) /** Return the 'weight' of this ticket for the - victim selection algorithm. Requests with + victim selection algorithm. Requests with lower weight are preferred to requests with higher weight when choosing a victim. */ @@ -2179,7 +2179,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request) to wait for another thread which is not ready to commit. This is always an error, as the upper level of parallel replication should not allow a scheduling of a conflicting DDL until all earlier - transactions has commited. + transactions have been committed. This function is only called for a slave using parallel replication and trying to get an exclusive lock for the table. diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 275dc1605d8..63df3a6b956 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7964,4 +7964,4 @@ ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS ER_NOT_ALLOWED_IN_THIS_CONTEXT eng "'%-.128s' is not allowed in this context" ER_DATA_WAS_COMMITED_UNDER_ROLLBACK - eng "Engine %s does not support rollback. Changes where commited during rollback call" + eng "Engine %s does not support rollback. Changes where committed during rollback call" diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 3ccab553bfe..e31e51d0316 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -671,7 +671,7 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, size_t mlen, RETURN VALUES FALSE Success - TRUE Error and send_error already commited + TRUE Error and send_error already committed */ static bool mysqld_help_internal(THD *thd, const char *mask) |