diff options
| author | unknown <andrey@lmy004.> | 2006-05-23 13:32:22 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-05-23 13:32:22 +0200 |
| commit | 91552f962f2e37831738dd6ba2bf36339559c8af (patch) | |
| tree | 1294ba4805f52b38c27d20b005eaef5f44ff4004 | |
| parent | 6f1ab9ba48c8980203e555f89691d461c637c524 (diff) | |
| download | mariadb-git-91552f962f2e37831738dd6ba2bf36339559c8af.tar.gz | |
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.
| -rw-r--r-- | mysql-test/r/not_embedded_server.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/sp-threads.result | 1 | ||||
| -rw-r--r-- | sql/event_scheduler.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 5 |
4 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result index e471b5a3afa..7cbe91b3753 100644 --- a/mysql-test/r/not_embedded_server.result +++ b/mysql-test/r/not_embedded_server.result @@ -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; diff --git a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result index c516d7a643f..3cba437e0a6 100644 --- a/mysql-test/r/sp-threads.result +++ b/mysql-test/r/sp-threads.result @@ -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 diff --git a/sql/event_scheduler.h b/sql/event_scheduler.h index 8ac3a3fc08c..247b4481c9f 100644 --- a/sql/event_scheduler.h +++ b/sql/event_scheduler.h @@ -192,7 +192,7 @@ private: */ COND_suspend_or_resume, /* Must be always last */ - COND_LAST, + COND_LAST }; /* Singleton instance */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 42d87d6dc2f..ccf52113c23 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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 |