diff options
| author | Luis Soares <luis.soares@oracle.com> | 2011-07-12 02:13:36 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2011-07-12 02:13:36 +0100 |
| commit | 624ed50ef3f46ff23db74ac07502d63a2f21c8a1 (patch) | |
| tree | 2ad53a260848e318063b3f3c0f8df0b265ade084 /include | |
| parent | e018925a64dc40f22bd6f370ccc732f75185a4d9 (diff) | |
| parent | b9dd956ab4e9982f6ff016135b2e008fb9dd6ecd (diff) | |
| download | mariadb-git-624ed50ef3f46ff23db74ac07502d63a2f21c8a1.tar.gz | |
BUG#12695969
Manually merged from mysql-5.0 into mysql-5.1.
conflicts
=========
include/Makefile.am
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 0cb8557aeb5..bd5d2a42b6d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -38,7 +38,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \ my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ my_compare.h my_time.h my_vle.h my_user.h \ - my_libwrap.h my_stacktrace.h + my_libwrap.h my_stacktrace.h welcome_copyright_notice.h EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp |