diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-03-12 13:29:11 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-03-12 13:29:11 +0100 |
| commit | e5ec52414c33ab8956542a1cba0e8bdb4fd43491 (patch) | |
| tree | 5061b7d8da5dd04e910dd576401aa3efe9bf1196 /include/Makefile.am | |
| parent | d2499e2dd1874ce62f4ff6d78b77be8e7e8e5480 (diff) | |
| parent | deeb3ee4258852940e48b0b7b950bc5e951831b4 (diff) | |
| download | mariadb-git-e5ec52414c33ab8956542a1cba0e8bdb4fd43491.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
configure.in:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043:
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 d40df7d8343..15f1a83c79d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -22,7 +22,7 @@ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ my_list.h my_alloc.h typelib.h pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ my_xml.h mysql_embed.h \ - my_semaphore.h my_pthread.h my_no_pthread.h \ + my_pthread.h my_no_pthread.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 \ |