- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
config/ac-macros/yassl.m4:
Add variable yassl_libs_with_path variable for libmysqld
configure.in:
Don't add yassl_libs to CLIENT_LIBS var since clients will be linked with libmysqlclient that includes yassl libs.
extra/yassl/src/Makefile.am:
Make a normal .a lib
extra/yassl/taocrypt/src/Makefile.am:
Make a normal .a lib
libmysql/Makefile.am:
Add yassl_libs to libmysql
libmysqld/Makefile.am:
Add yassl_libss_with_path to libmysqld
directory - these files are now maintained in the mysqldoc
repository and included in the source distribution during the
release build. Updated the configure.in script and Makefiles to
create the man page file list at build time
- Updated the file list in the RPM spec file to include all currently
available man pages (this can not be done with wildcards, as
the man pages are spread across several subpackages. However, RPM
warns about unpackaged files, so newly added man pages can be
spotted)
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
Delete: man/isamchk.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
Delete: man/isamlog.1.in
BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a:
Delete: man/mysql.1.in
BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf:
Delete: man/mysqlaccess.1.in
BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769:
Delete: man/mysqladmin.1.in
BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c:
Delete: man/mysqld.1.in
BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6:
Delete: man/mysqld_multi.1.in
BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b:
Delete: man/mysqld_safe.1.in
BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5:
Delete: man/mysqldump.1.in
BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325:
Delete: man/mysql_fix_privilege_tables.1.in
BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624:
Delete: man/mysql_zap.1.in
BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f:
Delete: man/mysqlshow.1.in
BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c:
Delete: man/perror.1.in
BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c:
Delete: man/replace.1.in
configure.in:
- dynamically add man pages included in the man directory
(the BK tree only contains one dummy file, the directory is
populated by the Bootstrap script by copying current man pages
from the documentation server)
man/Makefile.am:
- removed hard-coded list of man pages, the list is populated
during the configure stage. When building from BK, only one
placeholder file exists. For the release builds, this directory
is populated by the Bootstrap script, which takes man page files
from the documentation server.
man/mysqlman.1:
- removed version number
support-files/mysql.spec.sh:
- adjusted file list: added man pages that are now part of the
official source distribution (taken from the documentation
server)
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
client/Makefile.am:
Add yassl_includes
config/ac-macros/yassl.m4:
Use own variables for yassl, don't intrude on openssl
configure.in:
Add yassl_libs to lib_DEPENDENCIES and CLIENT_LIBS
libmysql/Makefile.am:
Add yassl_includes
libmysql_r/Makefile.am:
Add yassl_libs and yassl_includes
libmysqld/Makefile.am:
Add yassl_includes
server-tools/instance-manager/Makefile.am:
Add yassl includes and lib
sql/Makefile.am:
Add yassl includes and libe
vio/Makefile.am:
Add yassl includes and libe
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/m_string.h:
Auto merged
include/my_pthread.h:
Auto merged
myisam/mi_search.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
netware/pack_isam.def:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/xml.c:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
mysql-test/r/select.result:
Merged from 4.1.
netware/BUILD/mwenv:
Merged from 4.1.
scripts/make_binary_distribution.sh:
Merged from 4.1.
sql/mysqld.cc:
Merged from 4.1.
sql/sql_show.cc:
Merged from 4.1.
strings/my_strtoll10.c:
Merged from 4.1.
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)
configure.in:
Fix flags for Darwin 6 and later. Simplify Darwin 7-9 blocks to simply
be a catch-all for *darwin* so that future Darwin releases get the
latest flags.
include/config-win.h:
Define my_sigset() instead of sigset().
include/my_pthread.h:
Define my_sigset() instead of trying to monkey with sigset(), and favor
an implementation based on sigaction().
mysys/my_pthread.c:
Remove pthread_signal(), which is identical to the new my_sigset() macro.
mysys/thr_alarm.c:
Use my_sigset() instead of sigset().
sql/mysqld.cc:
Use my_sigset() instead of signal() and sigset(), remove unnecessary
definition of sigset on __amiga__. Remove unused THREAD_SPECIFIC_SIGPIPE
code.
A future improvement would be to re-assess the use of sigaction() here
and convert its usage to use my_sigset().
vio/vio.c:
Always call fcntl() to initialize flags of socket in initialization to
avoid problems on systems that don't report the flags on a socket
correctly right after it has been returned from accept(), such as
FreeBSD, Mac OS X, and possibly other BSD-derived systems.
vio/viosocket.c:
If fcntl() fails in vio_blocking(), restore the flags stored in the
vio struct.
mysql-test/r/wait_timeout.result:
New BitKeeper file ``mysql-test/r/wait_timeout.result''
mysql-test/t/wait_timeout-master.opt:
New BitKeeper file ``mysql-test/t/wait_timeout-master.opt''
mysql-test/t/wait_timeout.test:
New BitKeeper file ``mysql-test/t/wait_timeout.test''
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes
configure.in:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
ndb/include/kernel/signaldata/SystemError.hpp:
+ removed some unused codes
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
+ removed all progError(..0..) to make sure all error invocations have an error code
ndb/src/kernel/main.cpp:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
Enable "make distcheck" to work
configure.in:
Enable "make distcheck" to work
Docs/Makefile.am:
Enable "make distcheck" to work
Makefile.am:
Enable "make distcheck" to work
client/Makefile.am:
Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
Enable "make distcheck" to work
include/Makefile.am:
Enable "make distcheck" to work
libmysql/Makefile.am:
Enable "make distcheck" to work
libmysql_r/Makefile.am:
Enable "make distcheck" to work
libmysqld/Makefile.am:
Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
Enable "make distcheck" to work
mysql-test/Makefile.am:
Enable "make distcheck" to work
ndb/docs/Makefile.am:
Enable "make distcheck" to work
netware/Makefile.am:
Enable "make distcheck" to work
pstack/Makefile.am:
Enable "make distcheck" to work
scripts/Makefile.am:
Enable "make distcheck" to work
sql-bench/Makefile.am:
Enable "make distcheck" to work
sql/Makefile.am:
Enable "make distcheck" to work
sql/share/Makefile.am:
Enable "make distcheck" to work
support-files/Makefile.am:
Enable "make distcheck" to work
into mysql.com:/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/violite.h:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql-common/client.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
configure.in:
Resolve conflicts
into mysql.com:/home/jimw/my/mysql-5.0-clean
configure.in:
Auto merged
include/my_global.h:
Auto merged
myisam/mi_extra.c:
Auto merged
mysql-test/r/lowercase_table.result:
Auto merged
mysql-test/t/lowercase_table.test:
Auto merged
mysys/my_access.c:
Auto merged
BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
Auto merged
sql/examples/ha_tina.cc:
Resolve conflict
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156)
configure.in:
Add test for madvise() being declared when C++ compiler is used.
include/my_global.h:
Handle madvise() being available but not declared in C++
isam/extra.c:
Fix typo in define test
myisam/mi_extra.c:
Fix typo in define test
sql/examples/ha_tina.cc:
Test that we have madvise() before trying to call it.
configure.in:
Fix directories built using --without-server, and add mf_keycache.o
to list of objects only built for thread-safe library, since it requires
threading.
dbug/my_main.c:
Don't try to initialize thread globals if not built with threading.
mysys/Makefile.am:
Remove mf_keycache.c from list of files to build (it will be included
in THREAD_LOBJECTS when appropriate).
mysys/mf_getdate.c:
Fix usage of gmtime().
sql/share/Makefile.am:
Allow removal of mysqld_error.h to fail, in case it doesn't exist yet.
tests/Makefile.am:
Don't link against libmysys explicitly.
into mysql.com:/home/emurphy/src/work/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
include/m_ctype.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/charset.c:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-extra.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
configure.in:
Manual merge from 4.1
include/config-netware.h:
Manual merge from 4.1
sql/item.cc:
Manual merge from 4.1
sql/mysqld.cc:
Manual merge from 4.1
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
autoconf 2.52 is enough to build mysql-5.0
client/mysql.cc:
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in:
autoconf 2.52 is enough to build mysql-5.0
