summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorbrian@zim.(none) <>2006-08-19 10:23:22 -0700
committerbrian@zim.(none) <>2006-08-19 10:23:22 -0700
commit800e348740ca2b502cc697722ece2ff3a8417d1a (patch)
tree062459896af47cd55d827d7da71b11b4b43ce0c0 /libmysqld
parent849fac14961e258aa69cfbd943289b784f3b1c3f (diff)
downloadmariadb-git-800e348740ca2b502cc697722ece2ff3a8417d1a.tar.gz
Update to push all of merge into the merge storage directory.
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 9286f3688ac..e5bb8711131 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_myisam.cc ha_myisammrg.cc \
+ ha_myisam.cc \
ha_innodb.cc ha_ndbcluster.cc \
ha_ndbcluster_binlog.cc ha_partition.cc \
handler.cc sql_handler.cc \