summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-07-18 23:22:24 +0200
committerunknown <andrey@lmy004.>2006-07-18 23:22:24 +0200
commite86971948777bba5fa8e6f47759930e30fdd00ad (patch)
tree9b5af53e8b9ad0225c4c96e07b028c362c440eba
parent410a26210e9fa0719250382f618fe271f0e11f0c (diff)
parentd090462abc2925a22a4d2dee4c87d679a9ad32f1 (diff)
downloadmariadb-git-e86971948777bba5fa8e6f47759930e30fdd00ad.tar.gz
Merge lmy004.:/work/mysql-5.1-runtime
into lmy004.:/work/mysql-5.1-clean
-rw-r--r--libmysqld/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 69d8b6e0f67..ddb52ce9014 100644
--- a/libmysqld/CMakeLists.txt
+++ b/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