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
051015f8
Commit
051015f8
authored
Dec 30, 2017
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tentative fix for travis
This undoes a lock-unlock for LOCK_thread_count.
parent
b2a102fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
sql/log.cc
sql/log.cc
+3
-0
No files found.
sql/log.cc
View file @
051015f8
...
...
@@ -4178,6 +4178,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD *thd, bool create_new_log,
mysql_mutex_unlock
(
&
LOCK_xid_list
);
}
mysql_mutex_lock
(
&
LOCK_thread_count
);
/* Save variables so that we can reopen the log */
save_name
=
name
;
name
=
0
;
// Protect against free
...
...
@@ -4285,6 +4286,8 @@ bool MYSQL_BIN_LOG::reset_logs(THD *thd, bool create_new_log,
if
(
error
==
1
)
name
=
const_cast
<
char
*>
(
save_name
);
mysql_mutex_unlock
(
&
LOCK_thread_count
);
if
(
!
is_relay_log
)
{
xid_count_per_binlog
*
b
;
...
...
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