diff options
| author | unknown <brian@zim.(none)> | 2005-12-22 10:39:41 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-12-22 10:39:41 -0800 |
| commit | 2f7d04166534c7ac7962096045136385cf573703 (patch) | |
| tree | a2aeaa1be35cb94e2ec94e50390f94ce1af9de41 /libmysqld | |
| parent | 69221bba59734d89129ef5797645d80e729be79c (diff) | |
| parent | b35aaa277d0526a89bee8d4973795a6101053b66 (diff) | |
| download | mariadb-git-2f7d04166534c7ac7962096045136385cf573703.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/cluster-5.1
libmysqld/Makefile.am:
Auto merged
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 fb34b3a2bca..2e942e7a7fc 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -70,7 +70,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) EXTRA_libmysqld_a_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \ ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \ - ha_tina.cc ha_example.cc ha_partition.cc + ha_partition.cc libmysqld_a_DEPENDENCIES= @mysql_se_objs@ libmysqld_a_SOURCES= |