diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-09-22 21:51:17 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-09-22 21:51:17 -0600 |
commit | 30bba5dffcc400268446b12fa8ed8b875737c802 (patch) | |
tree | e4a77b49f0d4e78f22c4bc9ef9ac9b30a8a00624 /include/Makefile.am | |
parent | 08b94f415bbce53a9bbc5a11330b7c8fadf92b81 (diff) | |
parent | 5e0851e1b37debb59dbe184fcc3485470872ac64 (diff) | |
download | mariadb-git-30bba5dffcc400268446b12fa8ed8b875737c802.tar.gz |
merged
include/Makefile.am:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
client/Makefile.am:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_lex.h:
Auto merged
Diffstat (limited to 'include/Makefile.am')
-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 a6edc2b00e1..54451e9d4f6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -16,8 +16,8 @@ # MA 02111-1307, USA BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h -pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ - mysqld_error.h my_list.h \ +pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \ + mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \ my_global.h my_net.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ |