- Use libtool to build libraries
config/ac-macros/yassl.m4:
If necessary, disable inlining for all files in libtaocrypt not only integer.cpp
Remove ver yassl_libs_with_path, not used anymore
extra/yassl/src/Makefile.am:
Let libtool build libraries
extra/yassl/taocrypt/src/Makefile.am:
Let libtool build libraries
Only build one lib
libmysqld/Makefile.am:
Dont include yassl libs in libmysqld
libmysqld/examples/Makefile.am:
Add yassl includes and libs when linking examples with libmysqld
extra/innochecksum.c:
Define _XOPEN_SOURCE in order to include getopt.h when needed.
The problem is that some platforms (for instance,
SuSE 9.1/gcc-3.3.3) do not include getopt.h unless _XOPEN_SOURCE
is defined, so optarg is undefined and the compiler complains.
configure.in:
Removed duplicate "tools/Makefile", and unused AVAILABLE_LANGUAGES_ERRORS
Docs/Makefile.am:
Add generated files to explicitly be removed on "make distclean"
extra/Makefile.am:
Added empty SUBDIRS, else automake 1.6.3 will not
put out code for DIST_SUBDIRS handling
extra/yassl/Makefile.am:
"make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
extra/yassl/src/Makefile.am:
"make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
extra/yassl/taocrypt/src/Makefile.am:
"make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
sql/share/Makefile.am:
Added distclean target for "*/errmsg.sys"
client/Makefile.am:
Put links into current directory, not \$(srcdir)
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation
configure.in:
Use -Tno_implict to indicate that we specifiy which template should be instantiated.
Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION
extra/yassl/src/socket_wrapper.cpp:
Include sys/filio.h if __SCO_VERSION__ is defined
extra/yassl/src/timer.cpp:
Dont' include files from within namespace yaSSL.
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
config/ac-macros/yassl.m4:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Manual merge
- 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
BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
Delete: ndb/src/kernel/error/ErrorMessages.hpp
config/ac-macros/ha_ndbcluster.m4:
add ndb mgmapi to ndbcluster_includes
extra/perror.c:
perror to print also ndbd exit codes
ndb/include/Makefile.am:
added new ndbd exit code include file to src distribution
ndb/include/kernel/signaldata/EventReport.hpp:
backported from 5.1, included node id in event report signal
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
backported from 5.1, included node id in event report signal
- it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system.
- Added a fix that tries to open /dev/random if /dev/urandom is not available.
extra/yassl/taocrypt/src/random.cpp:
Try to open /dev/ranom if /dev/urandom is not available.
- Disable inlining in integer.cp for sparc solaris Cun C++ 5.6
config/ac-macros/yassl.m4:
Detect sparc Solaris + Sun C++ 5.6 and disable inlining for integer.cpp
extra/yassl/taocrypt/src/Makefile.am:
Compile integer.cpp into a separate lib in order to use special CXXFLAGS
Add the integer.cpp lib to libtaocrypt.la
- Avoid problem with "Sun C++ 5.6 2004/07/15"
extra/yassl/taocrypt/src/integer.cpp:
- Remove "inline" from the more advanced functions of class portable
Changed from C++ comments to C comments
Did some adaption to MySQL Coding Style
extra/innochecksum.c:
Changed from C++ comments to C comments
Did some adaption to MySQL Coding Style
extra/yassl/taocrypt/include/runtime.hpp:
Check for both __ICC and __INTEL_COMPILER
extra/yassl/taocrypt/include/types.hpp:
Check for both __ICC and __INTEL_COMPILER
- Workaround
extra/yassl/mySTL/helpers.hpp:
Workaround for QNX
extra/yassl/mySTL/list.hpp:
Use workaround for placement new
extra/yassl/taocrypt/src/misc.cpp:
Don't include <new>
- Temporary fix, disable x86 assembler.
BUILD/compile-pentium-icc:
Cleanup build script for icc
extra/yassl/taocrypt/include/misc.hpp:
Disable x86 assembler when compiling with icc
BUILD/compile-pentium-icc-yassl:
New BitKeeper file ``BUILD/compile-pentium-icc-yassl''
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
client/mysqltest.c:
Set the flag CLIENT_REMENBER_OPTIONS so that all connection attempts from mysqltest is done with the same settings.
Old impl caused mysqltest to loose all it's settings in the second connection attempt, ex ssl settings.
extra/yassl/src/socket_wrapper.cpp:
64-bit Solaris requires the variable passed to FIONREAD be a 32-bit value.
Using "int" unless _WIN32_ is defined.
sql/sql_parse.cc:
Update error message when sslaccepts fails. Must have been a copy and paste error.
vio/viossl.c:
Minor fixes
Add timeout to DBUG_PRINT
use function vio_ssl_fd to get sd from vio
Remove extra whitespace
vio/viosslfactories.c:
Remove DBUG_PRINT("enter" in sslaccept and sslconnect as it tries to print out null strings. That is not suported on all platforms.
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
Auto merged
BitKeeper/etc/config:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/help_end.h:
Auto merged
include/help_start.h:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamlog.c:
Auto merged
myisam/myisampack.c:
Auto merged
netware/myisamchk.def:
Auto merged
netware/mysql.def:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/mysqladmin.def:
Auto merged
netware/mysqlbinlog.def:
Auto merged
netware/mysqlcheck.def:
Auto merged
netware/mysqld_safe.c:
Auto merged
netware/mysqldump.def:
Auto merged
netware/mysqlimport.def:
Auto merged
netware/mysqlshow.def:
Auto merged
sql/ha_blackhole.cc:
Auto merged
sql/ha_blackhole.h:
Auto merged
sql/mysqld.cc:
Auto merged
client/client_priv.h:
Merged from 4.1
client/mysqladmin.cc:
Merged from 4.1
client/mysqlbinlog.cc:
Merged from 4.1
mysys/charset.c:
Merged from 4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
client/mysqlcheck.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/help_end.h:
Auto merged
include/help_start.h:
Auto merged
isam/isamchk.c:
Auto merged
isam/pack_isam.c:
Auto merged
myisam/myisamlog.c:
Auto merged
netware/myisamchk.def:
Auto merged
netware/mysql.def:
Auto merged
netware/mysqladmin.def:
Auto merged
netware/mysqlbinlog.def:
Auto merged
netware/mysqlcheck.def:
Auto merged
netware/mysqldump.def:
Auto merged
netware/mysqlimport.def:
Auto merged
netware/mysqlshow.def:
Auto merged
client/client_priv.h:
Merged from 4.0.
client/mysql.cc:
Merged from 4.0.
client/mysqladmin.cc:
Merged from 4.0.
client/mysqlbinlog.cc:
Merged from 4.0.
client/mysqldump.c:
Merged from 4.0.
client/mysqlshow.c:
Merged from 4.0.
myisam/myisamchk.c:
Merged from 4.0.
myisam/myisampack.c:
Merged from 4.0.
netware/mysql_test_run.c:
Merged from 4.0.
netware/mysqld_safe.c:
Merged from 4.0.
sql/mysqld.cc:
Merged from 4.0.
client/client_priv.h:
Added option auto close for Netware.
client/mysql.cc:
Added option auto close for Netware.
client/mysqladmin.c:
Added option auto close for Netware.
client/mysqlbinlog.cc:
Added option auto close for Netware.
client/mysqlcheck.c:
Added option auto close for Netware.
client/mysqldump.c:
Added option auto close for Netware.
client/mysqlimport.c:
Added option auto close for Netware.
client/mysqlshow.c:
Added option auto close for Netware.
client/mysqltest.c:
Fixed help messages for Netware.
extra/my_print_defaults.c:
Fixed help messages for Netware.
extra/perror.c:
Fixed help messages for Netware.
extra/resolve_stack_dump.c:
Fixed help messages for Netware.
include/help_end.h:
Fixed help messages for Netware.
include/help_start.h:
Fixed help messages for Netware.
isam/isamchk.c:
Added auto close of window for Netware
isam/pack_isam.c:
Added auto close of window for Netware
myisam/myisamchk.c:
Added auto close of window for Netware
myisam/myisamlog.c:
Added help for Netware.
myisam/myisampack.c:
Added auto close for Netware.
netware/myisamchk.def:
Scrollable screen patch.
netware/mysql.def:
Scrollable screen patch.
netware/mysql_test_run.c:
Fixed strindex for Netware.
netware/mysqladmin.def:
Scrollable screen patch.
netware/mysqlbinlog.def:
Scrollable screen patch.
netware/mysqlcheck.def:
Scrollable screen patch.
netware/mysqld_safe.c:
Removed debug message for Netware.
netware/mysqldump.def:
Scrollable screen patch.
netware/mysqlimport.def:
Scrollable screen patch.
netware/mysqlshow.def:
Scrollable screen patch.
sql/mysqld.cc:
Abnormal end patch when shutting down and volume not ready.
Visual Studio 2003. I have not yet changed the windows build scripts
to use these.
VC++Files/bdb/bdb.vcproj:
New BitKeeper file ``VC++Files/bdb/bdb.vcproj''
VC++Files/client/mysql.vcproj:
New BitKeeper file ``VC++Files/client/mysql.vcproj''
VC++Files/client/mysqladmin.vcproj:
New BitKeeper file ``VC++Files/client/mysqladmin.vcproj''
VC++Files/client/mysqlclient.vcproj:
New BitKeeper file ``VC++Files/client/mysqlclient.vcproj''
VC++Files/client/mysqldump.vcproj:
New BitKeeper file ``VC++Files/client/mysqldump.vcproj''
VC++Files/client/mysqlimport.vcproj:
New BitKeeper file ``VC++Files/client/mysqlimport.vcproj''
VC++Files/client/mysqlshow.vcproj:
New BitKeeper file ``VC++Files/client/mysqlshow.vcproj''
VC++Files/client/mysqltest.vcproj:
New BitKeeper file ``VC++Files/client/mysqltest.vcproj''
VC++Files/comp_err/comp_err.vcproj:
New BitKeeper file ``VC++Files/comp_err/comp_err.vcproj''
VC++Files/dbug/dbug.vcproj:
New BitKeeper file ``VC++Files/dbug/dbug.vcproj''
VC++Files/heap/heap.vcproj:
New BitKeeper file ``VC++Files/heap/heap.vcproj''
VC++Files/innobase/innobase.vcproj:
New BitKeeper file ``VC++Files/innobase/innobase.vcproj''
VC++Files/libmysql/libmysql.vcproj:
New BitKeeper file ``VC++Files/libmysql/libmysql.vcproj''
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
New BitKeeper file ``VC++Files/libmysqld/examples/test_libmysqld.vcproj''
VC++Files/libmysqld/libmysqld.vcproj:
New BitKeeper file ``VC++Files/libmysqld/libmysqld.vcproj''
VC++Files/libmysqltest/myTest.vcproj:
New BitKeeper file ``VC++Files/libmysqltest/myTest.vcproj''
VC++Files/my_print_defaults/my_print_defaults.vcproj:
New BitKeeper file ``VC++Files/my_print_defaults/my_print_defaults.vcproj''
VC++Files/myisam/myisam.vcproj:
New BitKeeper file ``VC++Files/myisam/myisam.vcproj''
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
New BitKeeper file ``VC++Files/myisam_ftdump/myisam_ftdump.vcproj''
VC++Files/myisamchk/myisamchk.vcproj:
New BitKeeper file ``VC++Files/myisamchk/myisamchk.vcproj''
VC++Files/myisamlog/myisamlog.vcproj:
New BitKeeper file ``VC++Files/myisamlog/myisamlog.vcproj''
VC++Files/myisammrg/myisammrg.vcproj:
New BitKeeper file ``VC++Files/myisammrg/myisammrg.vcproj''
VC++Files/myisampack/myisampack.vcproj:
New BitKeeper file ``VC++Files/myisampack/myisampack.vcproj''
VC++Files/mysql-test/mysql_test_run_new.vcproj:
New BitKeeper file ``VC++Files/mysql-test/mysql_test_run_new.vcproj''
VC++Files/mysql.sln:
New BitKeeper file ``VC++Files/mysql.sln''
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
New BitKeeper file ``VC++Files/mysqlbinlog/mysqlbinlog.vcproj''
VC++Files/mysqlcheck/mysqlcheck.vcproj:
New BitKeeper file ``VC++Files/mysqlcheck/mysqlcheck.vcproj''
VC++Files/mysqldemb/mysqldemb.vcproj:
New BitKeeper file ``VC++Files/mysqldemb/mysqldemb.vcproj''
VC++Files/mysqlserver/mysqlserver.vcproj:
New BitKeeper file ``VC++Files/mysqlserver/mysqlserver.vcproj''
VC++Files/mysys/mysys.vcproj:
New BitKeeper file ``VC++Files/mysys/mysys.vcproj''
VC++Files/perror/perror.vcproj:
New BitKeeper file ``VC++Files/perror/perror.vcproj''
VC++Files/regex/regex.vcproj:
New BitKeeper file ``VC++Files/regex/regex.vcproj''
VC++Files/replace/replace.vcproj:
New BitKeeper file ``VC++Files/replace/replace.vcproj''
VC++Files/sql/mysqld.vcproj:
New BitKeeper file ``VC++Files/sql/mysqld.vcproj''
VC++Files/strings/strings.vcproj:
New BitKeeper file ``VC++Files/strings/strings.vcproj''
VC++Files/test1/test1.vcproj:
New BitKeeper file ``VC++Files/test1/test1.vcproj''
VC++Files/tests/mysql_client_test.vcproj:
New BitKeeper file ``VC++Files/tests/mysql_client_test.vcproj''
VC++Files/thr_test/thr_test.vcproj:
New BitKeeper file ``VC++Files/thr_test/thr_test.vcproj''
VC++Files/vio/vio.vcproj:
New BitKeeper file ``VC++Files/vio/vio.vcproj''
VC++Files/zlib/zlib.vcproj:
New BitKeeper file ``VC++Files/zlib/zlib.vcproj''
extra/yassl/taocrypt/taocrypt.vcproj:
New BitKeeper file ``extra/yassl/taocrypt/taocrypt.vcproj''
extra/yassl/yassl.vcproj:
New BitKeeper file ``extra/yassl/yassl.vcproj''
fix now checks if the original (from) file is a symlink and uses the
link name. This prevents creation of a new file (and loss of symlink)
when renaming the tempfile.
