diff options
| author | unknown <joerg@trift2.> | 2007-04-13 10:53:35 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-04-13 10:53:35 +0200 |
| commit | 3268d0c677cf5b953b7f6316de7508ea5d0d84ca (patch) | |
| tree | 2f2c17bb1e66be915eadc2b359c9c0ae1c6ccbbb /include | |
| parent | 2e73a53e033741b09a652646d9cfa0e76c33e6a1 (diff) | |
| parent | 0d982c5d67a539f93171c1ab1a9a021623fa2eb5 (diff) | |
| download | mariadb-git-3268d0c677cf5b953b7f6316de7508ea5d0d84ca.tar.gz | |
Merge trift2.:/MySQL/M50/bug27456-5.0
into trift2.:/MySQL/M51/bug27456-5.1
include/Makefile.am:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 15f1a83c79d..1498aed3b9f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -23,7 +23,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 \ - 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 mysql/plugin.h $(HEADERS_GEN) @@ -34,7 +34,7 @@ noinst_HEADERS = config-win.h config-netware.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ my_aes.h my_tree.h my_trie.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_vle.h my_user.h my_atomic.h atomic/nolock.h \ atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \ my_libwrap.h |