diff options
| author | unknown <joerg@debian.(none)> | 2007-04-20 12:31:03 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-04-20 12:31:03 +0200 |
| commit | 515c64875b91c93de45cd4e8a2361327383a36c8 (patch) | |
| tree | 47d004d52f842265cb7a96ee4b590f89e39585d0 /include | |
| parent | 4eecb58fd65e77091c930f0a039a59e85d2c1b5d (diff) | |
| parent | ad14c2475b523c39d06767896ae6d98178fcc579 (diff) | |
| download | mariadb-git-515c64875b91c93de45cd4e8a2361327383a36c8.tar.gz | |
Merge debian.(none):/M50/mysql-5.0
into debian.(none):/M50/push-5.0
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_delete.cc:
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 9cd2f6215f1..95a7a4803e0 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 $(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 |