diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:15:11 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:15:11 +0100 |
| commit | d4d8d132ebdd7d171e15f6dd8a224270748b11be (patch) | |
| tree | 5068c9a5d62bf06ae4ade775f50ab6e149951768 /include/Makefile.am | |
| parent | 0fcd9c2bfb68e8c2078e975d69cb25992324fe13 (diff) | |
| parent | 32b370bb7f561a6623c1d0e028331250d6936b0a (diff) | |
| download | mariadb-git-d4d8d132ebdd7d171e15f6dd8a224270748b11be.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
include/Makefile.am:
Auto merged
Diffstat (limited to 'include/Makefile.am')
| -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 3a3b319505c..740267ef027 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -18,7 +18,7 @@ BUILT_SOURCES = mysql_version.h my_config.h abi_check pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ - my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ + my_pthread.h my_no_pthread.h raid.h \ errmsg.h my_global.h my_net.h my_alloc.h \ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ |