mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 00:05:33 +02:00
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
This commit is contained in:
commit
2f7d041665
7 changed files with 8 additions and 139 deletions
|
|
@ -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=
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue