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
57f824b0
Commit
57f824b0
authored
May 18, 2012
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post-merge fixes
sql/slave.cc: add mutex protection, like in sql_parse.cc
parent
0a8c9b98
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
mysql-test/suite/innodb/t/disabled.def
mysql-test/suite/innodb/t/disabled.def
+2
-1
mysql-test/suite/innodb_plugin/t/disabled.def
mysql-test/suite/innodb_plugin/t/disabled.def
+3
-0
mysql-test/suite/innodb_plugin/t/innodb-blob.test
mysql-test/suite/innodb_plugin/t/innodb-blob.test
+0
-1
sql/slave.cc
sql/slave.cc
+5
-1
No files found.
mysql-test/suite/innodb/t/disabled.def
View file @
57f824b0
...
...
@@ -10,6 +10,7 @@
#
##############################################################################
#innodb_bug53756 : Waiting for merge with Percona Server; bug fixed in innodb_plugin in MySQL 5.1.50
innodb_bug13635833: Disabled until merging with XtraDB 5.1.63
innodb-lock: Disabled until merging with XtraDB 5.1.60
innodb_replace: Disabled until merging with XtraDB 5.1.60
mysql-test/suite/innodb_plugin/t/disabled.def
View file @
57f824b0
...
...
@@ -10,7 +10,10 @@
#
##############################################################################
innodb_bug13635833: Disabled until merging with XtraDB 5.1.63
innodb_bug52745: Disabled as this has valgrind failures (also in MySQL 5.1.50)
innodb-index: Disabled until merging with XtraDB 5.1.60
innodb-lock: Disabled until merging with XtraDB 5.1.60
innodb_replace: Disabled until merging with XtraDB 5.1.60
innodb-blob: Disabled until merging with XtraDB 5.1.63
mysql-test/suite/innodb_plugin/t/innodb-blob.test
View file @
57f824b0
...
...
@@ -3,7 +3,6 @@
# columns are stored off-page.
--
source
include
/
have_innodb_plugin
.
inc
skip
Not
fixed
in
XtraDB
yet
;
# DEBUG_SYNC must be compiled in.
--
source
include
/
have_debug_sync
.
inc
...
...
sql/slave.cc
View file @
57f824b0
...
...
@@ -1451,7 +1451,9 @@ Waiting for the slave SQL thread to free enough relay log space");
#endif
if
(
rli
->
sql_force_rotate_relay
)
{
pthread_mutex_lock
(
&
active_mi
->
data_lock
);
rotate_relay_log
(
rli
->
mi
);
pthread_mutex_unlock
(
&
active_mi
->
data_lock
);
rli
->
sql_force_rotate_relay
=
false
;
}
...
...
@@ -4531,7 +4533,6 @@ int rotate_relay_log(Master_info* mi)
DBUG_ENTER
(
"rotate_relay_log"
);
Relay_log_info
*
rli
=
&
mi
->
rli
;
int
error
=
0
;
safe_mutex_assert_owner
(
&
mi
->
data_lock
);
/*
We need to test inited because otherwise, new_file() will attempt to lock
...
...
@@ -4559,7 +4560,10 @@ int rotate_relay_log(Master_info* mi)
output in SHOW SLAVE STATUS meanwhile. So we harvest now.
If the log is closed, then this will just harvest the last writes, probably
0 as they probably have been harvested.
Note that it needs to be protected by mi->data_lock.
*/
safe_mutex_assert_owner
(
&
mi
->
data_lock
);
rli
->
relay_log
.
harvest_bytes_written
(
&
rli
->
log_space_total
);
end:
DBUG_RETURN
(
error
);
...
...
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