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

into  lmy004.:/work/mysql-5.1-clean

libmysqld/CMakeLists.txt

@@ -28,7 +28,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
             ../client/get_password.c ../libmysql/errmsg.c
             ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c
             ../sql-common/my_time.c ../sql-common/my_user.c
-            ../sql-common/pack.c ../sql/derror.cc ../sql/event_executor.cc
+            ../sql-common/pack.c ../sql/derror.cc ../sql/event_scheduler.cc
             ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc
             ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc
             ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc