diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-12 04:04:43 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-12 04:04:43 +0300 |
| commit | 514e60480d77236aedb1ab69c0e7754e060e495a (patch) | |
| tree | 4ba65b7347df0448111dd1a3ab055bc2c8a1c6dc /mysys/Makefile.am | |
| parent | 9b1930152db6ecd30b8cbcc7200af2baf7f82295 (diff) | |
| parent | 071994ba3665ce2284de5e77a4f06c0b6e93eeeb (diff) | |
| download | mariadb-git-514e60480d77236aedb1ab69c0e7754e060e495a.tar.gz | |
merge with 3.23.52
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
include/my_no_pthread.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_net.c:
Auto merged
mysys/mysys_priv.h:
Auto merged
mysys/thr_rwlock.c:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/sql_insert.cc:
Auto merged
include/my_sys.h:
merge with 3.23
libmysql/Makefile.shared:
merge with 3.23
mysql-test/mysql-test-run.sh:
merge with 3.23
mysql-test/r/func_if.result:
merge with 3.23
mysys/Makefile.am:
merge with 3.23
mysys/my_gethostbyname.c:
merge with 3.23
sql/ha_innodb.cc:
merge with 3.23
sql/item_cmpfunc.cc:
merge with 3.23
sql/mysqld.cc:
merge with 3.23
sql/sql_show.cc:
merge with 3.23
Diffstat (limited to 'mysys/Makefile.am')
| -rw-r--r-- | mysys/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 646bedf9603..4ff1b04fc79 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -49,7 +49,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_quick.c my_lockmem.c my_static.c \ my_getopt.c my_mkdir.c \ default.c my_compress.c checksum.c raid.cc \ - my_net.c my_semaphore.c \ + my_net.c my_semaphore.c my_port.c \ my_vsnprintf.c charset.c my_bitmap.c my_bit.c md5.c \ my_gethostbyname.c rijndael.c my_aes.c sha1.c EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ |