| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
extra/comp_err.c:
Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
scripts/mysqld_multi.sh:
Auto merged
extra/comp_err.c:
Manual merge: From 4.1 to 5.0, the license line was moved to a different place.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
extra/comp_err.c:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Copyright string fixes (bug#16106)
extra/comp_err.c:
Ensure that the license spelling is as expected by the "mysql_copyright" tool.
(bug#16106)
scripts/mysqld_multi.sh:
The "mysql_copyright" tool will not change non-C files, so do not mention the license.
(bug#16106)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Report error when there is nothing to read after wait.
extra/yassl/src/handshake.cpp:
Report error if there is nothing to read after a blocking read
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/usr/local/mysql/mysql-5.0
|
| | | |
| | | |
| | | |
| | | |
| | | | |
extra/innochecksum.c:
Fix _XOPEN_SOURCE define to not break compile on QNX and IRIX
|
|/ / / |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- 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.
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
configure.in:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | |
| | |
| | |
| | |
| | | |
extra/yassl/taocrypt/src/Makefile.am:
Build libtaoint first and then link the .o file from that into libtaocrypt.a
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Netware. Hartmut informed about this.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/mgmsrv/Services.cpp:
Auto merged
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into mysql.com:/home/jimw/my/mysql-5.0-clean
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
server error messages file. (Bug #13071)
extra/comp_err.c:
Fail when two messages for the same language are given for an error
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
ndb/tools/ndb_config.cpp:
Auto merged
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into neptunus.(none):/home/msvensson/mysql/bug13163/my50-bug13163
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- It seems like malloc(0) returns a null pointer on aix52
extra/yassl/mySTL/vector.hpp:
Don't allow malloc(0), if n is 0 use 1
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into neptunus.(none):/home/msvensson/mysql/bug13476/my50-bug13476
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
extra/yassl/taocrypt/include/hmac.hpp:
Rename BSIZE to HMAC_BSIZE to avoid conflict with BSIZE on "openserv 3.2 5.0.7"
|
|/ / / / / |
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- 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.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
-Applied patch from Todd
extra/yassl/src/ssl.cpp:
Call processReply until clientFinishedComplete or error
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- 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
|
|/ / / /
| | | |
| | | |
| | | |
| | | | |
extra/yassl/taocrypt/src/integer.cpp:
Exclude
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- 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
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into hundin.mysql.fi:/home/jan/mysql-5.0
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
extra/Makefile.am:
Add innochecksum back to compiled programs.
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix some comments.
extra/comp_err.c:
Fix some comments.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
|/ / /
| | |
| | |
| | |
| | | |
extra/yassl/taocrypt/include/misc.hpp:
Disable X86ASM on OsX
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- 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>
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into hundin.mysql.fi:/home/jan/new/mysql-5.0
BitKeeper/etc/ignore:
auto-union
|