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
7b672bc9
Commit
7b672bc9
authored
Dec 18, 2001
by
sasha@mysql.sashanet.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make replication work correctly if the master logs SELECT RELEASE_LOCK()
instead of DO RELEASE_LOCK()
parent
862cbdfe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
8 deletions
+20
-8
mysql-test/t/rpl_get_lock.test
mysql-test/t/rpl_get_lock.test
+3
-4
sql/sql_parse.cc
sql/sql_parse.cc
+17
-4
No files found.
mysql-test/t/rpl_get_lock.test
View file @
7b672bc9
source
include
/
master
-
slave
.
inc
;
connection
master
;
create
table
t1
(
n
int
);
create
table
t2
(
n
int
);
insert
into
t1
values
(
get_lock
(
"lock"
,
2
));
dirty_close
master
;
connection
master1
;
select
get_lock
(
"lock"
,
2
);
select
release_lock
(
"lock"
);
let
$
1
=
2000
0
;
let
$
1
=
2000
;
while
(
$
1
)
{
select
get_lock
(
"lock"
,
2
);
select
release_lock
(
"lock"
);
do
get_lock
(
"lock"
,
2
);
do
release_lock
(
"lock"
);
dec
$
1
;
}
save_master_pos
;
...
...
sql/sql_parse.cc
View file @
7b672bc9
...
...
@@ -1071,10 +1071,23 @@ mysql_execute_command(void)
TABLE_LIST
*
tables
=
(
TABLE_LIST
*
)
lex
->
table_list
.
first
;
DBUG_ENTER
(
"mysql_execute_command"
);
if
(
table_rules_on
&&
thd
->
slave_thread
&&
tables
&&
!
tables_ok
(
thd
,
tables
))
DBUG_VOID_RETURN
;
// skip if we are in the slave thread, some table
// rules have been given and the table list says the query should not be
// replicated
if
(
thd
->
slave_thread
)
{
// skip if we are in the slave thread, some table
// rules have been given and the table list says the query should not be
// replicated
if
(
table_rules_on
&&
tables
&&
!
tables_ok
(
thd
,
tables
))
DBUG_VOID_RETURN
;
// this is a workaround to deal with the shortcoming
// in 3.23.44-3.23.46 masters
// in RELEASE_LOCK() logging. We re-write SELECT RELEASE_LOCK() as
// DO RELEASE_LOCK()
if
(
lex
->
sql_command
==
SQLCOM_SELECT
)
{
lex
->
sql_command
=
SQLCOM_DO
;
lex
->
insert_list
=
&
lex
->
item_list
;
}
}
thread_safe_increment
(
com_stat
[
lex
->
sql_command
],
&
LOCK_thread_count
);
switch
(
lex
->
sql_command
)
{
...
...
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