summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Merge 192.168.0.20:mysql/my50-maint-yasslunknown2006-05-0816-58/+79
|\ | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint extra/yassl/src/ssl.cpp: Auto merged extra/yassl/taocrypt/src/make.bat: Auto merged extra/yassl/testsuite/test.hpp: Auto merged
| * Import from yaSSLunknown2006-05-052-2/+9
| | | | | | | | | | | | | | extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/testsuite/test.hpp: Import patch yassl.diff
| * Import from yaSSLunknown2006-05-0515-58/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/examples/client/client.cpp: Import patch yassl.diff extra/yassl/examples/echoclient/echoclient.cpp: Import patch yassl.diff extra/yassl/examples/echoserver/echoserver.cpp: Import patch yassl.diff extra/yassl/examples/server/server.cpp: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/include/yassl_types.hpp: Import patch yassl.diff extra/yassl/src/make.bat: Import patch yassl.diff extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/yassl_imp.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/taocrypt/benchmark/make.bat: Import patch yassl.diff extra/yassl/taocrypt/src/make.bat: Import patch yassl.diff extra/yassl/taocrypt/test/make.bat: Import patch yassl.diff extra/yassl/testsuite/make.bat: Import patch yassl.diff extra/yassl/testsuite/testsuite.cpp: Import patch yassl.diff
* | Use "const char*" for variable found, forte complains "Cannot use const ↵unknown2006-05-031-1/+1
| | | | | | | | char* to initialize char*" otherwise
* | Merge 192.168.0.20:mysql/my50-maint-yasslunknown2006-05-0334-36/+907
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint extra/yassl/mySTL/helpers.hpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/taocrypt/src/asn.cpp: Auto merged extra/yassl/taocrypt/src/make.bat: Auto merged extra/yassl/testsuite/test.hpp: Auto merged extra/yassl/taocrypt/include/asn.hpp: Manual merge
| * Add original unmodified certs fileunknown2006-05-034-2/+1
| | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-dh1024.dat~eb7af7494ea8ec62: Delete: extra/yassl/certs/dh1024.dat extra/yassl/certs/client-cert.der: Add original unmodified file extra/yassl/certs/client-key.der: Add original unmodified file extra/yassl/certs/dsa512.der: Add original unmodified file
| * Add certs/ fileunknown2006-05-034-0/+2
| | | | | | | | | | | | | | | | | | | | | | extra/yassl/certs/client-cert.der: New BitKeeper file ``extra/yassl/certs/client-cert.der'' extra/yassl/certs/client-key.der: New BitKeeper file ``extra/yassl/certs/client-key.der'' extra/yassl/certs/dh1024.dat: New BitKeeper file ``extra/yassl/certs/dh1024.dat'' extra/yassl/certs/dsa512.der: New BitKeeper file ``extra/yassl/certs/dsa512.der''
| * Update yaSSL to version 1.3.0unknown2006-05-0333-57/+979
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/README: Import patch yassl.diff extra/yassl/examples/client/client.cpp: Import patch yassl.diff extra/yassl/include/openssl/err.h: Import patch yassl.diff extra/yassl/include/openssl/md5.h: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/include/yassl_int.hpp: Import patch yassl.diff extra/yassl/mySTL/helpers.hpp: Import patch yassl.diff extra/yassl/src/cert_wrapper.cpp: Import patch yassl.diff extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/template_instnt.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/taocrypt/include/asn.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/asn.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/integer.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/make.bat: Import patch yassl.diff extra/yassl/taocrypt/src/misc.cpp: Import patch yassl.diff extra/yassl/taocrypt/taocrypt.dsp: Import patch yassl.diff extra/yassl/testsuite/test.hpp: Import patch yassl.diff extra/yassl/testsuite/testsuite.cpp: Import patch yassl.diff extra/yassl/testsuite/testsuite.dsp: Import patch yassl.diff extra/yassl/include/openssl/md4.h: Import patch yassl.diff extra/yassl/include/openssl/pem.h: Import patch yassl.diff extra/yassl/include/openssl/x509.h: Import patch yassl.diff extra/yassl/include/openssl/x509v3.h: Import patch yassl.diff extra/yassl/lib/dummy: Import patch yassl.diff extra/yassl/certs/ca-cert.pem: New BitKeeper file ``extra/yassl/certs/ca-cert.pem'' extra/yassl/certs/client-cert.pem: New BitKeeper file ``extra/yassl/certs/client-cert.pem'' extra/yassl/certs/client-key.pem: New BitKeeper file ``extra/yassl/certs/client-key.pem'' extra/yassl/certs/dsa-cert.pem: New BitKeeper file ``extra/yassl/certs/dsa-cert.pem'' extra/yassl/certs/dsa512.pem: New BitKeeper file ``extra/yassl/certs/dsa512.pem'' extra/yassl/certs/server-cert.pem: New BitKeeper file ``extra/yassl/certs/server-cert.pem'' extra/yassl/certs/server-key.pem: New BitKeeper file ``extra/yassl/certs/server-key.pem'' extra/yassl/certs/taoCert.txt: New BitKeeper file ``extra/yassl/certs/taoCert.txt''
* | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2006-04-287-23/+74
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/taocrypt/src/template_instnt.cpp: Auto merged
| * Merge 192.168.0.20:mysql/my50-maint-yassl/unknown2006-04-267-23/+74
| |\ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * Move inclusion of "ripemd.hpp" from yassl to taocryptunknown2006-04-262-1/+1
| | |
| | * Import from upstream yasslunknown2006-04-266-22/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/mySTL/helpers.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/asn.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/asn.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/make.bat: Import patch yassl.diff extra/yassl/taocrypt/src/template_instnt.cpp: Import patch yassl.diff extra/yassl/testsuite/test.hpp: Import patch yassl.diff
* | | Fix merge errorunknown2006-04-272-9/+1
| | | | | | | | | | | | | | | | | | | | | extra/yassl/src/yassl_int.cpp: Fix merge error, missing { extra/yassl/taocrypt/src/integer.cpp: Fix merge error, duplicate function definition
* | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0unknown2006-04-27101-1311/+10592
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged configure.in: Auto merged extra/yassl/include/openssl/rsa.h: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/include/yassl_types.hpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/taocrypt/include/integer.hpp: Auto merged extra/yassl/taocrypt/include/misc.hpp: Auto merged extra/yassl/taocrypt/src/algebra.cpp: Auto merged extra/yassl/taocrypt/src/template_instnt.cpp: Auto merged mysql-test/t/disabled.def: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged extra/yassl/include/openssl/ssl.h: Manual merge extra/yassl/src/handshake.cpp: Manual merge extra/yassl/src/yassl_int.cpp: Manual merge extra/yassl/taocrypt/include/runtime.hpp: Manual merge extra/yassl/taocrypt/src/integer.cpp: Manual merge mysql-test/mysql-test-run.pl: Manual merge mysql-test/r/trigger.result: Manual merge mysql-test/t/trigger.test: Manual merge
| * | Remove -Wall etc, not so portable compiler optionsunknown2006-04-211-3/+3
| |/
| * Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cppunknown2006-04-212-7/+3
| |
| * Add the .der files used by yaSSL benchmarkunknown2006-04-193-0/+0
| | | | | | | | | | | | | | | | | | extra/yassl/taocrypt/benchmark/dh1024.der: New BitKeeper file ``extra/yassl/taocrypt/benchmark/dh1024.der'' extra/yassl/taocrypt/benchmark/dsa1024.der: New BitKeeper file ``extra/yassl/taocrypt/benchmark/dsa1024.der'' extra/yassl/taocrypt/benchmark/rsa1024.der: New BitKeeper file ``extra/yassl/taocrypt/benchmark/rsa1024.der''
| * Add .der files, used by yaSSL benchmarkunknown2006-04-191-1/+1
| | | | | | | | | | | | | | | | Add benchamrk to dirs to build extra/yassl/taocrypt/Makefile.am: Add benchmark to dirs to build
| * Import from upstream yaSSLunknown2006-04-194-58/+55
| | | | | | | | | | | | | | | | | | | | | | extra/yassl/src/template_instnt.cpp: Import patch yassl.diff extra/yassl/taocrypt/include/misc.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/template_instnt.cpp: Import patch yassl.diff extra/yassl/taocrypt/test/test.cpp: Import patch yassl.diff
| * Import from yaSSL upstreamunknown2006-04-1822-49/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/include/openssl/rsa.h: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/include/yassl_int.hpp: Import patch yassl.diff extra/yassl/include/yassl_types.hpp: Import patch yassl.diff extra/yassl/mySTL/helpers.hpp: Import patch yassl.diff extra/yassl/mySTL/list.hpp: Import patch yassl.diff extra/yassl/mySTL/vector.hpp: Import patch yassl.diff extra/yassl/src/handshake.cpp: Import patch yassl.diff extra/yassl/src/socket_wrapper.cpp: Import patch yassl.diff extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/yassl_imp.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/taocrypt/benchmark/benchmark.cpp: Import patch yassl.diff extra/yassl/taocrypt/include/integer.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/misc.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/runtime.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/types.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/algebra.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/integer.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/misc.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/random.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/template_instnt.cpp: Import patch yassl.diff
| * Add new yaSSL filesunknown2006-04-116-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add benchmark, testsuite and taocrypt/test as places where to produce Makfiles and build - very useful for debugging config/ac-macros/yassl.m4: Add Makefiles for yassl testsuite and benchmark extra/yassl/Makefile.am: Add new subdir testsuite extra/yassl/taocrypt/Makefile.am: Add new subdir test for the taocrypt test extra/yassl/taocrypt/src/Makefile.am: Add all new files for yaSSL and organize them alphabetically extra/yassl/taocrypt/benchmark/Makefile.am: New BitKeeper file ``extra/yassl/taocrypt/benchmark/Makefile.am'' extra/yassl/taocrypt/test/Makefile.am: New BitKeeper file ``extra/yassl/taocrypt/test/Makefile.am'' extra/yassl/testsuite/Makefile.am: New BitKeeper file ``extra/yassl/testsuite/Makefile.am''
| * Update yassl to 1.2.2unknown2006-04-0791-1312/+10540
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/examples/client/client.cpp: Import patch yassl.diff extra/yassl/README: Import patch yassl.diff extra/yassl/examples/client/client.dsp: Import patch yassl.diff extra/yassl/examples/echoclient/echoclient.cpp: Import patch yassl.diff extra/yassl/examples/echoclient/echoclient.dsp: Import patch yassl.diff extra/yassl/examples/echoclient/input: Import patch yassl.diff extra/yassl/examples/echoclient/quit: Import patch yassl.diff extra/yassl/examples/echoserver/echoserver.cpp: Import patch yassl.diff extra/yassl/examples/echoserver/echoserver.dsp: Import patch yassl.diff extra/yassl/examples/server/server.cpp: Import patch yassl.diff extra/yassl/examples/server/server.dsp: Import patch yassl.diff extra/yassl/include/cert_wrapper.hpp: Import patch yassl.diff extra/yassl/include/crypto_wrapper.hpp: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/include/socket_wrapper.hpp: Import patch yassl.diff extra/yassl/include/yassl.hpp: Import patch yassl.diff extra/yassl/include/yassl_error.hpp: Import patch yassl.diff extra/yassl/include/yassl_imp.hpp: Import patch yassl.diff extra/yassl/include/yassl_int.hpp: Import patch yassl.diff extra/yassl/include/yassl_types.hpp: Import patch yassl.diff extra/yassl/mySTL/helpers.hpp: Import patch yassl.diff extra/yassl/mySTL/list.hpp: Import patch yassl.diff extra/yassl/mySTL/vector.hpp: Import patch yassl.diff extra/yassl/src/buffer.cpp: Import patch yassl.diff extra/yassl/src/cert_wrapper.cpp: Import patch yassl.diff extra/yassl/src/crypto_wrapper.cpp: Import patch yassl.diff extra/yassl/src/handshake.cpp: Import patch yassl.diff extra/yassl/src/make.bat: Import patch yassl.diff extra/yassl/src/socket_wrapper.cpp: Import patch yassl.diff extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/yassl.cpp: Import patch yassl.diff extra/yassl/taocrypt/benchmark/benchmark.cpp: Import patch yassl.diff extra/yassl/taocrypt/benchmark/benchmark.dsp: Import patch yassl.diff extra/yassl/taocrypt/benchmark/make.bat: Import patch yassl.diff extra/yassl/taocrypt/include/blowfish.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/kernelc.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/pwdbased.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/twofish.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/bftables.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/blowfish.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/make.bat: Import patch yassl.diff extra/yassl/taocrypt/src/tftables.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/twofish.cpp: Import patch yassl.diff extra/yassl/taocrypt/test.dsp: Import patch yassl.diff extra/yassl/taocrypt/test.dsw: Import patch yassl.diff extra/yassl/taocrypt/test/make.bat: Import patch yassl.diff extra/yassl/taocrypt/test/memory.cpp: Import patch yassl.diff extra/yassl/taocrypt/test/test.cpp: Import patch yassl.diff extra/yassl/testsuite/input: Import patch yassl.diff extra/yassl/src/timer.cpp: Import patch yassl.diff extra/yassl/src/yassl_error.cpp: Import patch yassl.diff extra/yassl/src/yassl_imp.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/taocrypt/include/aes.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/arc4.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/asn.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/block.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/des.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/dh.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/hash.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/hmac.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/md5.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/misc.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/modes.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/ripemd.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/runtime.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/sha.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/types.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/aes.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/aestables.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/algebra.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/arc4.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/asn.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/coding.cpp: Import patch yassl.diff extra/yassl/testsuite/make.bat: Import patch yassl.diff extra/yassl/testsuite/quit: Import patch yassl.diff extra/yassl/testsuite/test.hpp: Import patch yassl.diff extra/yassl/testsuite/testsuite.cpp: Import patch yassl.diff extra/yassl/testsuite/testsuite.dsp: Import patch yassl.diff extra/yassl/taocrypt/src/des.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/dh.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/hash.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/integer.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/md5.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/misc.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/random.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/ripemd.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/sha.cpp: Import patch yassl.diff extra/yassl/taocrypt/taocrypt.dsp: Import patch yassl.diff extra/yassl/yassl.dsp: Import patch yassl.diff extra/yassl/yassl.dsw: Import patch yassl.diff
* | Bug#18815 libmysql using yassl can't be linked with c programunknown2006-04-1813-30/+83
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Apply patch to remove dependency on C++ libs when linking "libmysql" from c extra/yassl/include/openssl/rsa.h: Fix spelling error extra/yassl/include/openssl/ssl.h: Fix spelling error extra/yassl/include/yassl_int.hpp: Remove static instance extra/yassl/include/yassl_types.hpp: Add CleanUp function for static singletons extra/yassl/src/handshake.cpp: Use buffered.reset(0) instead of null_buffer extra/yassl/src/template_instnt.cpp: Add instantiation of two new templates extra/yassl/src/yassl_int.cpp: Use static pointers for singletons extra/yassl/taocrypt/include/integer.hpp: Remove statoc singletons from class scope extra/yassl/taocrypt/include/misc.hpp: Add clenaup function extra/yassl/taocrypt/include/runtime.hpp: Add runtime for Solaris extra/yassl/taocrypt/src/algebra.cpp: Use mySTL::vector to avoid array of Element being on the stack extra/yassl/taocrypt/src/integer.cpp: Use static pointers for singletons Add cleanup function extra/yassl/taocrypt/src/template_instnt.cpp: Add instantiation of one new template
* Bug #17235 perror prints wrong prefix for ndb error codesunknown2006-02-081-1/+15
|
* extra/comp_err.c : Fix a merge error.unknown2006-01-161-1/+2
| | | | | extra/comp_err.c: Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).
* Manual merge of the fix for bug#16106.unknown2006-01-161-4/+4
|\ | | | | | | | | | | | | | | | | | | | | 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.
| * Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1unknown2006-01-131-1/+3
| |\ | | | | | | | | | | | | | | | | | | extra/comp_err.c: Auto merged scripts/mysqld_multi.sh: Auto merged
| | * extra/comp_err.c + scripts/mysqld_multi.sh :unknown2006-01-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | Bug #15772 Aborted YaSSL connections force threads into busyloopsunknown2005-12-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-141-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/usersnfs/knielsen/mysql-5.0
| * | | Patch for Bug#13640unknown2005-12-141-2/+2
| | | |
* | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-12-081-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0
| * | | Fix QNX and IRIX compilationunknown2005-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | extra/innochecksum.c: Fix _XOPEN_SOURCE define to not break compile on QNX and IRIX
* | | | compatibility fix for yasslunknown2005-12-022-0/+5
|/ / /
* | | Merge ↵unknown2005-11-252-10/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168 into devsrv-b.mysql.com:/space/magnus/mysql-5.0
| * | | Bug #15168 yassl failure on amd64unknown2005-11-242-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Make it buildable with -ansi flag on some platforms.unknown2005-11-241-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-194-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
| * | | Additional "make distcheck" changes specific to 5.0unknown2005-11-094-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | Bug#13957 yassl: opensrv6c compile failureunknown2005-11-032-6/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | Update after merge, include libtaoint-integer.o into libtaocrypt.aunknown2005-10-281-4/+7
| | | | | | | | | | | | | | | extra/yassl/taocrypt/src/Makefile.am: Build libtaoint first and then link the .o file from that into libtaocrypt.a
* | | Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985unknown2005-10-282-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linkingunknown2005-10-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Had to revert change, because it breaks compilation forunknown2005-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Netware. Hartmut informed about this.
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-061-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ndb/src/mgmsrv/Services.cpp: Auto merged
| * | | | added structured ndbd exit codesunknown2005-10-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-13071unknown2005-10-051-7/+23
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | Fail when two messages exist for the same language for an error in theunknown2005-10-051-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server error messages file. (Bug #13071) extra/comp_err.c: Fail when two messages for the same language are given for an error
* | | | | Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-302-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hartmut/projects/mysql/dev/5.0 ndb/tools/ndb_config.cpp: Auto merged
| * \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-09-271-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug13163/my50-bug13163
View Lorry Controller Status