summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorjoerg@trift-lap.fambruehe <>2007-04-26 16:06:44 +0200
committerjoerg@trift-lap.fambruehe <>2007-04-26 16:06:44 +0200
commit2ed383302ff9f0d325768e8835044d8b2a214a61 (patch)
tree0122eecfb2051d0a90c61f33cfcdef2bf4102f0f /include
parent9e4cc9e393a62bb64b126c3d96b9805f32eaea31 (diff)
parente0f148d5f076a974c4b98f1fdca4d072d2ee4c66 (diff)
downloadmariadb-git-2ed383302ff9f0d325768e8835044d8b2a214a61.tar.gz
Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0
into trift-lap.fambruehe:/MySQL/M50/push-5.0
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index e5fac39e5ff..ccd5ac627bf 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -22,7 +22,7 @@ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
my_xml.h mysql_embed.h \
my_pthread.h my_no_pthread.h raid.h \
- errmsg.h my_global.h my_net.h \
+ decimal.h errmsg.h my_global.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
m_ctype.h my_attribute.h $(HEADERS_GEN)
@@ -33,7 +33,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
my_aes.h my_tree.h hash.h thr_alarm.h \
thr_lock.h t_ctype.h violite.h md5.h base64.h \
- mysql_version.h.in my_handler.h my_time.h decimal.h \
+ mysql_version.h.in my_handler.h my_time.h \
my_user.h my_libwrap.h
# Remove built files and the symlinked directories