diff options
author | unknown <rburnett@bk-internal.mysql.com> | 2006-09-11 16:43:56 +0200 |
---|---|---|
committer | unknown <rburnett@bk-internal.mysql.com> | 2006-09-11 16:43:56 +0200 |
commit | 567561edcc798165969eef3adc141aa56eda2f46 (patch) | |
tree | 71bc99db428caec87e18b723beb03b0c7f20f2ad /libmysqld | |
parent | 4bc575334518b8375987f32915d6b5749cee9685 (diff) | |
parent | a822d65149c507c4b519aeea8a7ae30a734d0447 (diff) | |
download | mariadb-git-567561edcc798165969eef3adc141aa56eda2f46.tar.gz |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index e6d1c1acfca..08a8d68b2e5 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -44,7 +44,7 @@ libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ noinst_HEADERS = embedded_priv.h emb_qcache.h sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ - ha_innodb.cc ha_ndbcluster.cc \ + ha_ndbcluster.cc \ ha_ndbcluster_binlog.cc ha_partition.cc \ handler.cc sql_handler.cc \ hostname.cc init.cc password.c \ |