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
a06cd2cb
Commit
a06cd2cb
authored
Oct 21, 2013
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Plain Diff
Merge 5.3 -> 5.5
parents
11005f34
046fe911
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/slave.cc
sql/slave.cc
+4
-0
No files found.
sql/mysqld.cc
View file @
a06cd2cb
...
@@ -2615,7 +2615,7 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache)
...
@@ -2615,7 +2615,7 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache)
/* It's safe to broadcast outside a lock (COND... is not deleted here) */
/* It's safe to broadcast outside a lock (COND... is not deleted here) */
DBUG_PRINT
(
"signal"
,
(
"Broadcasting COND_thread_count"
));
DBUG_PRINT
(
"signal"
,
(
"Broadcasting COND_thread_count"
));
DBUG_LEAVE
;
// Must match DBUG_ENTER()
DBUG_LEAVE
;
// Must match DBUG_ENTER()
#if
ndef EMBEDDED_LIBRARY
#if
defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
ERR_remove_state
(
0
);
ERR_remove_state
(
0
);
#endif
#endif
my_thread_end
();
my_thread_end
();
...
...
sql/slave.cc
View file @
a06cd2cb
...
@@ -3377,7 +3377,9 @@ log space");
...
@@ -3377,7 +3377,9 @@ log space");
DBUG_LEAVE
;
// Must match DBUG_ENTER()
DBUG_LEAVE
;
// Must match DBUG_ENTER()
my_thread_end
();
my_thread_end
();
#ifdef HAVE_OPENSSL
ERR_remove_state
(
0
);
ERR_remove_state
(
0
);
#endif
pthread_exit
(
0
);
pthread_exit
(
0
);
return
0
;
// Avoid compiler warnings
return
0
;
// Avoid compiler warnings
}
}
...
@@ -3783,7 +3785,9 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
...
@@ -3783,7 +3785,9 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
DBUG_LEAVE
;
// Must match DBUG_ENTER()
DBUG_LEAVE
;
// Must match DBUG_ENTER()
my_thread_end
();
my_thread_end
();
#ifdef HAVE_OPENSSL
ERR_remove_state
(
0
);
ERR_remove_state
(
0
);
#endif
pthread_exit
(
0
);
pthread_exit
(
0
);
return
0
;
// Avoid compiler warnings
return
0
;
// Avoid compiler warnings
}
}
...
...
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