mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

various fixes after push of fix for bug#17619

Browse source 
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.
This commit is contained in:
unknown 2006-05-23 13:32:22 +02:00
parent 6f1ab9ba48
commit 91552f962f
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/not_embedded_server.result
View file

@ -1,5 +1,6 @@
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;

1
mysql-test/r/sp-threads.result
View file

@ -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

2
sql/event_scheduler.h
View file

@ -192,7 +192,7 @@ private:
*/
COND_suspend_or_resume,
/* Must be always last */
COND_LAST,
COND_LAST
};
/* Singleton instance */

5
sql/mysqld.cc
View file

@ -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