diff options
| author | unknown <brian@zim.(none)> | 2006-08-19 10:23:22 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-19 10:23:22 -0700 |
| commit | d1c1dac8193053168032fe1792b014a51c0e7652 (patch) | |
| tree | 062459896af47cd55d827d7da71b11b4b43ce0c0 /libmysqld | |
| parent | 39f1d9f411160beb20f367fec4d01f9721d7a513 (diff) | |
| download | mariadb-git-d1c1dac8193053168032fe1792b014a51c0e7652.tar.gz | |
Update to push all of merge into the merge storage directory.
storage/myisammrg/ha_myisammrg.h:
Rename: sql/ha_myisammrg.h -> storage/myisammrg/ha_myisammrg.h
storage/federated/CMakeLists.txt:
BitKeeper file /home/brian/mysql/arch-5.1/storage/federated/CMakeLists.txt
libmysqld/Makefile.am:
Removed mrg
sql/CMakeLists.txt:
Removed mrg
sql/Makefile.am:
Removed mrg
sql/handler.cc:
Removed mrg include (no longer needed)
sql/sql_cache.cc:
Updated include files
storage/heap/Makefile.am:
Formatting
storage/myisammrg/Makefile.am:
Updated makefile for mrg
storage/myisammrg/ha_myisammrg.cc:
Updated Makefile
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 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 \ |