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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ddb93b42
Commit
ddb93b42
authored
Oct 14, 2015
by
Nirbhay Choubey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WSREP_TO_ISOLATION_BEGIN should be called with the table list.
parent
950e6f5b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
14 deletions
+13
-14
sql/sql_base.cc
sql/sql_base.cc
+11
-11
sql/wsrep_mysqld.cc
sql/wsrep_mysqld.cc
+2
-3
No files found.
sql/sql_base.cc
View file @
ddb93b42
...
...
@@ -4706,17 +4706,6 @@ restart:
if
(
!
tbl
)
continue
;
if
(
WSREP_ON
&&
wsrep_replicate_myisam
&&
tables
&&
tbl
->
file
->
ht
==
myisam_hton
&&
sqlcom_can_generate_row_events
(
thd
)
&&
thd
->
get_command
()
!=
COM_STMT_PREPARE
&&
tables
->
lock_type
>=
TL_WRITE_ALLOW_WRITE
)
{
WSREP_TO_ISOLATION_BEGIN
(
NULL
,
NULL
,
tables
);
}
/* Schema tables may not have a TABLE object here. */
if
(
tbl
->
file
->
ht
->
db_type
==
DB_TYPE_MRG_MYISAM
)
{
...
...
@@ -4743,6 +4732,17 @@ restart:
}
}
if
(
WSREP_ON
&&
wsrep_replicate_myisam
&&
(
*
start
)
&&
(
*
start
)
->
table
&&
(
*
start
)
->
table
->
file
->
ht
==
myisam_hton
&&
sqlcom_can_generate_row_events
(
thd
)
&&
thd
->
get_command
()
!=
COM_STMT_PREPARE
)
{
WSREP_TO_ISOLATION_BEGIN
(
NULL
,
NULL
,
(
*
start
));
}
error:
THD_STAGE_INFO
(
thd
,
stage_after_opening_tables
);
thd_proc_info
(
thd
,
0
);
...
...
sql/wsrep_mysqld.cc
View file @
ddb93b42
...
...
@@ -1091,7 +1091,6 @@ static bool wsrep_prepare_keys_for_isolation(THD* thd,
if
(
db
||
table
)
{
TABLE_LIST
tmp_table
;
MDL_request
mdl_request
;
memset
(
&
tmp_table
,
0
,
sizeof
(
tmp_table
));
tmp_table
.
table_name
=
(
char
*
)
table
;
...
...
@@ -1683,7 +1682,7 @@ wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
}
else
if
(
granted_thd
->
lex
->
sql_command
==
SQLCOM_FLUSH
)
{
WSREP_DEBUG
(
"
mdl
granted over FLUSH BF"
);
WSREP_DEBUG
(
"
MDL
granted over FLUSH BF"
);
ticket
->
wsrep_report
(
wsrep_debug
);
mysql_mutex_unlock
(
&
granted_thd
->
LOCK_wsrep_thd
);
ret
=
TRUE
;
...
...
@@ -1698,7 +1697,7 @@ wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
}
else
if
(
granted_thd
->
wsrep_query_state
==
QUERY_COMMITTING
)
{
WSREP_DEBUG
(
"
mdl granted, but commi
ting thd abort scheduled"
);
WSREP_DEBUG
(
"
MDL granted, but commit
ting thd abort scheduled"
);
ticket
->
wsrep_report
(
wsrep_debug
);
mysql_mutex_unlock
(
&
granted_thd
->
LOCK_wsrep_thd
);
wsrep_abort_thd
((
void
*
)
request_thd
,
(
void
*
)
granted_thd
,
1
);
...
...
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