diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:22:02 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:22:02 +0100 |
| commit | deeb3ee4258852940e48b0b7b950bc5e951831b4 (patch) | |
| tree | f1eb3ac56ebb042ac46ccacf30780dbba5e96b9b /include/Makefile.am | |
| parent | 3c8117277601c48a86302ec40dc789a468a425c9 (diff) | |
| parent | d429f590111698d88cfece92c1f3e059af2be306 (diff) | |
| download | mariadb-git-deeb3ee4258852940e48b0b7b950bc5e951831b4.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/mysys/mysys_ia64.dsp:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-my_semaphore.c:
Auto merged
VC++Files/mysys/mysys.dsp:
SCCS 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 7b71ef62489..9cd2f6215f1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -21,7 +21,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 raid.h \ + my_pthread.h my_no_pthread.h raid.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 \ |