summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2005-10-28 03:26:56 +0300
committerunknown <jani@ua141d10.elisa.omakaista.fi>2005-10-28 03:26:56 +0300
commita397d1f7149dcdeac86e9e4870780dcd8e99a908 (patch)
treed1232fb8d8b8a779c44c5cf0faedee2f0919b2cb /include
parenta9cf9ae00c66972e46e954ee627a8254d85cfcf4 (diff)
parent8b851fa3e55bddc3a290f548cb3ce1614ac573ad (diff)
downloadmariadb-git-a397d1f7149dcdeac86e9e4870780dcd8e99a908.tar.gz
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 5f426843950..b8e420bff0e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -29,7 +29,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
mysys_err.h my_base.h help_start.h help_end.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 \
+ 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 are generated