Commit f0a73097 authored by unknown's avatar unknown

various fixes after push of fix for bug#17619


mysql-test/r/not_embedded_server.result:
  update result
mysql-test/r/sp-threads.result:
  update result
sql/event_scheduler.h:
  fix build error with SUN compiler
sql/mysqld.cc:
  fix problem with --init-file which was expecting to be the only running
  thread. nevertheless Events should be started as close as possible to the
  place connections are handled.
parent 06ec1db2
prepare stmt1 from ' show full processlist '; prepare stmt1 from ' show full processlist ';
execute stmt1; execute stmt1;
Id User Host db Command Time State Info 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 number root localhost test Query time NULL show full processlist
deallocate prepare stmt1; deallocate prepare stmt1;
...@@ -34,6 +34,7 @@ lock tables t2 write; ...@@ -34,6 +34,7 @@ lock tables t2 write;
call bug9486(); call bug9486();
show processlist; show processlist;
Id User Host db Command Time State Info Id User Host db Command Time State Info
# event_scheduler localhost NULL Connect # Suspended NULL
# root localhost test Sleep # NULL # root localhost test Sleep # NULL
# root localhost test Query # Locked update t1, t2 set val= 1 where id1=id2 # root localhost test Query # Locked update t1, t2 set val= 1 where id1=id2
# root localhost test Query # NULL show processlist # root localhost test Query # NULL show processlist
......
...@@ -192,7 +192,7 @@ class Event_scheduler ...@@ -192,7 +192,7 @@ class Event_scheduler
*/ */
COND_suspend_or_resume, COND_suspend_or_resume,
/* Must be always last */ /* Must be always last */
COND_LAST, COND_LAST
}; };
/* Singleton instance */ /* Singleton instance */
......
...@@ -3575,7 +3575,6 @@ we force server id to 2, but this MySQL server will not act as a slave."); ...@@ -3575,7 +3575,6 @@ we force server id to 2, but this MySQL server will not act as a slave.");
if (!opt_noacl) if (!opt_noacl)
{ {
Events::init();
plugin_load(); plugin_load();
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
udf_init(); udf_init();
...@@ -3626,6 +3625,10 @@ we force server id to 2, but this MySQL server will not act as a slave."); ...@@ -3626,6 +3625,10 @@ we force server id to 2, but this MySQL server will not act as a slave.");
mysqld_server_started= 1; mysqld_server_started= 1;
pthread_cond_signal(&COND_server_started); pthread_cond_signal(&COND_server_started);
if (!opt_noacl)
{
Events::init();
}
#if defined(__NT__) || defined(HAVE_SMEM) #if defined(__NT__) || defined(HAVE_SMEM)
handle_connections_methods(); handle_connections_methods();
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment