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
86052a95
Commit
86052a95
authored
May 23, 2006
by
andrey@lmy004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
various fixes after push of fix for bug#17619
parent
f234eef1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
mysql-test/r/not_embedded_server.result
mysql-test/r/not_embedded_server.result
+1
-0
mysql-test/r/sp-threads.result
mysql-test/r/sp-threads.result
+1
-0
sql/event_scheduler.h
sql/event_scheduler.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+4
-1
No files found.
mysql-test/r/not_embedded_server.result
View file @
86052a95
prepare stmt1 from ' show full processlist ';
execute stmt1;
Id User Host db Command Time State Info
number event_scheduler localhost NULL Connect time Suspended NULL
number root localhost test Query time NULL show full processlist
deallocate prepare stmt1;
mysql-test/r/sp-threads.result
View file @
86052a95
...
...
@@ -34,6 +34,7 @@ lock tables t2 write;
call bug9486();
show processlist;
Id User Host db Command Time State Info
# event_scheduler localhost NULL Connect # Suspended NULL
# root localhost test Sleep # NULL
# root localhost test Query # Locked update t1, t2 set val= 1 where id1=id2
# root localhost test Query # NULL show processlist
...
...
sql/event_scheduler.h
View file @
86052a95
...
...
@@ -192,7 +192,7 @@ private:
*/
COND_suspend_or_resume
,
/* Must be always last */
COND_LAST
,
COND_LAST
};
/* Singleton instance */
...
...
sql/mysqld.cc
View file @
86052a95
...
...
@@ -3575,7 +3575,6 @@ we force server id to 2, but this MySQL server will not act as a slave.");
if
(
!
opt_noacl
)
{
Events
::
init
();
plugin_load
();
#ifdef HAVE_DLOPEN
udf_init
();
...
...
@@ -3626,6 +3625,10 @@ we force server id to 2, but this MySQL server will not act as a slave.");
mysqld_server_started
=
1
;
pthread_cond_signal
(
&
COND_server_started
);
if
(
!
opt_noacl
)
{
Events
::
init
();
}
#if defined(__NT__) || defined(HAVE_SMEM)
handle_connections_methods
();
#else
...
...
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