1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix spelling errors

Browse Source
This commit is contained in:
Otto Kekäläinen 2020-06-14 14:49:45 +03:00 committed by Daniel Black
parent 05fa4558e0
commit ab48901d54
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/maria/maria-connect.result
View File

@ -11,7 +11,7 @@ ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
show warnings; show warnings;
Level Code Message Level Code Message
Error 1062 Duplicate entry '2' for key 'PRIMARY' 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 Warning 1196 Some non-transactional changed tables couldn't be rolled back
select * from t1; select * from t1;
a a

2
sql/mdl.cc
View File

@ -2179,7 +2179,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
to wait for another thread which is not ready to commit. to wait for another thread which is not ready to commit.
This is always an error, as the upper level of parallel replication This is always an error, as the upper level of parallel replication
should not allow a scheduling of a conflicting DDL until all earlier 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 This function is only called for a slave using parallel replication
and trying to get an exclusive lock for the table. and trying to get an exclusive lock for the table.

2
sql/share/errmsg-utf8.txt
View File

@ -7964,4 +7964,4 @@ ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS
ER_NOT_ALLOWED_IN_THIS_CONTEXT ER_NOT_ALLOWED_IN_THIS_CONTEXT
eng "'%-.128s' is not allowed in this context" eng "'%-.128s' is not allowed in this context"
ER_DATA_WAS_COMMITED_UNDER_ROLLBACK 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"

2
sql/sql_help.cc
View File

@ -671,7 +671,7 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, size_t mlen,
RETURN VALUES RETURN VALUES
FALSE Success 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) static bool mysqld_help_internal(THD *thd, const char *mask)