Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ab48901d
Commit
ab48901d
authored
Jun 14, 2020
by
Otto Kekäläinen
Committed by
Daniel Black
Jul 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spelling errors
parent
05fa4558
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
mysql-test/suite/maria/maria-connect.result
mysql-test/suite/maria/maria-connect.result
+1
-1
sql/mdl.cc
sql/mdl.cc
+2
-2
sql/share/errmsg-utf8.txt
sql/share/errmsg-utf8.txt
+1
-1
sql/sql_help.cc
sql/sql_help.cc
+1
-1
No files found.
mysql-test/suite/maria/maria-connect.result
View file @
ab48901d
...
@@ -11,7 +11,7 @@ ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
...
@@ -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 commit
t
ed 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
...
...
sql/mdl.cc
View file @
ab48901d
...
@@ -1035,7 +1035,7 @@ void MDL_ticket::destroy(MDL_ticket *ticket)
...
@@ -1035,7 +1035,7 @@ void MDL_ticket::destroy(MDL_ticket *ticket)
/**
/**
Return the 'weight' of this ticket for the
Return the 'weight' of this ticket for the
victim selection algorithm. Requests with
victim selection algorithm. Requests with
lower weight are preferred to requests
lower weight are preferred to requests
with higher weight when choosing a victim.
with higher weight when choosing a victim.
*/
*/
...
@@ -2179,7 +2179,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
...
@@ -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 ha
s commi
ted.
transactions ha
ve been commit
ted.
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.
...
...
sql/share/errmsg-utf8.txt
View file @
ab48901d
...
@@ -7964,4 +7964,4 @@ ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS
...
@@ -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 commit
t
ed during rollback call"
sql/sql_help.cc
View file @
ab48901d
...
@@ -671,7 +671,7 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, size_t mlen,
...
@@ -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 commit
t
ed
*/
*/
static
bool
mysqld_help_internal
(
THD
*
thd
,
const
char
*
mask
)
static
bool
mysqld_help_internal
(
THD
*
thd
,
const
char
*
mask
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment