summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <rburnett@bk-internal.mysql.com>2006-05-17 15:03:17 +0200
committerunknown <rburnett@bk-internal.mysql.com>2006-05-17 15:03:17 +0200
commit7fb42f4788faa03254abb62a2109d0d0fe63d1bf (patch)
tree8af41c61387c2506ce9abda72d8efdf12a2e320a /libmysqld
parentc4e26cb03dc35bb980e493e37a91b725e0d21b3b (diff)
parentac9124eddd8d33d64c0f151474fcc71cfa795993 (diff)
downloadmariadb-git-7fb42f4788faa03254abb62a2109d0d0fe63d1bf.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 8bd0e0baa32..ff8ceda5c5b 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -33,7 +33,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc
../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc
../sql/ha_myisammrg.cc ${mysql_se_ha_src}
- ../sql/handler.cc ../sql/handlerton-win.cc ../sql/hash_filo.cc
+ ../sql/handler.cc ../sql/hash_filo.cc
../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc
../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc
../sql/item_func.cc ../sql/item_geofunc.cc ../sql/item_row.cc