Merge lmy004.:/work/mysql-5.1-release

into lmy004.:/work/mysql-5.1-release-17619-try3

mysql-test/r/not_embedded_server.result

 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

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

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

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