Commit graph

29971 commits

Author SHA1 Message Date
unknown
23aeb617ed Check if "../libtool" is available and use it only when it is. 2006-05-03 20:04:57 +02:00
unknown
8d1b76e7f6 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-03 19:41:57 +02:00
unknown
cb241bdc09 Use "const char*" for variable found, forte complains "Cannot use const char* to initialize char*" otherwise 2006-05-03 17:55:30 +02:00
unknown
e3d7061d66 Remove C++ comments
Formatting
2006-05-03 16:59:02 +02:00
unknown
184ae8820e Move "max-connect-retries" option to get alpabetichal order 2006-05-03 15:53:59 +02:00
unknown
d8c26c7b22 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/mysql-5.0-maint
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0-maint
2006-05-03 14:12:38 +02:00
unknown
dc86d73a81 Add an untrusted cacert used when testing 2006-05-03 14:10:22 +02:00
unknown
e5b7c41df9 Load CA certs before setting local certs.
Make it possible to get the yaSSL error message printed in the DBUG log file.


vio/viossl.c:
  Add possibility to print out the error from yaSSL.
vio/viosslfactories.c:
  Load the CA certs before loading the certs for this client or server.
  Improved comments.
2006-05-03 14:09:08 +02:00
unknown
a524c8ebe9 Add tests for connecting to server with invalid and blank certs. 2006-05-03 14:06:34 +02:00
unknown
9d1c19c7b0 Add support for specifyihng the number of reconnec retries oin the command line 2006-05-03 14:04:54 +02:00
unknown
3f56853fcf Merge 192.168.0.20:mysql/my50-maint-yassl
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
2006-05-03 13:24:06 +02:00
unknown
54feed92b5 Add original unmodified certs file
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
2006-05-03 13:20:51 +02:00
unknown
dbd1c536ac Add certs/ file
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''
2006-05-03 13:11:04 +02:00
unknown
f0b1a331da Update yaSSL to version 1.3.0
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''
2006-05-03 13:08:24 +02:00
unknown
a84a4bf2c3 Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/ 2006-05-03 12:05:04 +02:00
unknown
f93e8193c0 Merge 192.168.0.20:mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


SSL/server-cert.pem:
  Merge, use remote
2006-05-03 11:59:43 +02:00
unknown
4204f5e192 Remove client-req-pem and server-req.pem
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Delete: SSL/server-req.pem
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Delete: SSL/client-req.pem
2006-05-03 11:53:16 +02:00
unknown
d5276f71ca Update NOTES with information how we generate new keys 2006-05-03 11:50:45 +02:00
unknown
bd0794bc37 Generate new ca, client and server cert.
Set CN in the server cert to localhost so that we can test --ssl-verify-server-cert


SSL/cacert.pem:
  Generate new CA cert to get the CA's private key
SSL/client-cert.pem:
  Generate new client cert since we have a new CA cert
SSL/client-key.pem:
  Generate new client cert since we have a new CA cert
SSL/client-req.pem:
  Generate new client cert since we have a new CA cert
SSL/server-cert.pem:
  Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert
SSL/server-key.pem:
  Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert
SSL/server-req.pem:
  Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert
2006-05-03 11:31:23 +02:00
unknown
34ca365b20 Use libtool --mode=execute when starting the mysqld as well.
Add $exe_libtool to be used throughout the script
2006-05-02 14:46:18 +02:00
unknown
3a01face76 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-02 09:30:30 +02:00
unknown
d0ed411f79 Fix small bug in udf_example.cc, it was processing one char too much and thus returning junk
Add more DBUG_PRINT's in udf_handler::val_str
Enable udf.test


mysql-test/t/disabled.def:
  Enable udf.test
sql/item_func.cc:
  Add DBUG_ printouts for easier debugging of installed udf's
sql/udf_example.cc:
  Bug fix, break for loop when "n < n_end"
2006-04-28 11:37:20 +02:00
unknown
2ffbb8019d Merge neptunus.(none):/home/msvensson/mysql/tmp_jimw_federated
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-28 08:35:02 +02:00
unknown
7a601d0ccb Merge bk-internal:/home/bk/mysql-5.0-maint
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
2006-04-28 08:33:42 +02:00
unknown
dc101c2cd0 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean


mysql-test/mysql-test-run.pl:
  Auto merged
2006-04-28 00:33:47 +02:00
unknown
c357525e42 Disable udf.test 2006-04-27 22:30:14 +02:00
unknown
83a7198493 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-27 22:24:32 +02:00
unknown
7bddd524d7 Fix merge error
extra/yassl/src/yassl_int.cpp:
  Fix merge error, missing {
extra/yassl/taocrypt/src/integer.cpp:
  Fix merge error, duplicate function definition
2006-04-27 22:21:23 +02:00
unknown
185c89c419 Return empty string if file does not exist
Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example


mysql-test/lib/mtr_misc.pl:
  Return empty string if file does not exist
mysql-test/mysql-test-run.pl:
  Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example variable
2006-04-27 21:26:24 +02:00
unknown
9681b731d1 Merge mysql.com:/home/jimw/my/mysql-5.0-19393
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-27 10:56:44 -07:00
unknown
d985ed4ca9 Bug #19393: Federated tests fail on Windows under pushbuild
Supplying --skip-rpl to mysql-test-run.pl would always disable the
  slaves, but those slaves may still be needed for the federated tests.
  Now we only disable the slaves when they are not used by any of the
  tests.


mysql-test/mysql-test-run.pl:
  Decide whether to set up and start slave databases based entirely on
  which tests are used, and don't allow --skip-rpl to ruin the party,
  since other tests than replication rely on the slaves (namely federated).
2006-04-27 10:53:19 -07:00
unknown
8d1230c6ad Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
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
2006-04-27 17:35:29 +02:00
unknown
1bdc15e100 Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library. 


mysql-test/include/have_udf.inc:
  Add check if udf_example.so(or similar) is available
mysql-test/lib/mtr_misc.pl:
  Add funcion "mtr_file_exist" to search for files
mysql-test/mysql-test-run.pl:
  Add checks to find the udf_example.so library
mysql-test/r/udf.result:
  Update result
mysql-test/t/disabled.def:
  Remove udf.test from disabled tests
mysql-test/t/udf.test:
  Use variable UDF_EXAMPLE_LIB when looking for shared library to load
mysql-test/r/have_udf_example.require:
  New BitKeeper file ``mysql-test/r/have_udf_example.require''
2006-04-27 16:32:40 +02:00
unknown
66b56724ff Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/set_var.cc:
  Auto merged
2006-04-27 07:53:15 -05:00
unknown
f0e7abfcc1 set_var.cc:
System variable was added out of lexical order.


sql/set_var.cc:
  System variable was added out of lexical order.
2006-04-27 07:51:56 -05:00
unknown
e187468d24 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-04-27 11:38:48 +02:00
unknown
c8e2e3fd96 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-27 11:28:15 +02:00
unknown
96f58e1b26 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-27 08:37:45 +02:00
unknown
8b553a3f6b Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1)
mysql-test/ndb/ndbcluster.sh:
  redirect to /dev/null to avoid grep -q
2006-04-26 20:50:27 -07:00
unknown
47ce2876b5 Remove obsolete test
mysql-test/r/user_var.result:
  Update results
mysql-test/t/user_var.test:
  Remove unnecessary test
2006-04-26 17:09:41 -07:00
unknown
c09e213b61 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 15:29:32 -07:00
unknown
58629f016b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-26 23:10:36 +02:00
unknown
88724885d5 Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
include/mysql.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  SCCS merged
2006-04-26 22:24:25 +02:00
unknown
8d52b8a6b7 Merge mysql.com:/home/jimw/my/mysql-5.0-12792
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict
2006-04-26 11:39:48 -07:00
unknown
2d91c31b3d Merge mysql.com:/home/jimw/my/mysql-5.0-18617
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/mysql-test-run.pl:
  Resolve conflict
2006-04-26 11:37:53 -07:00
unknown
2d85fd8083 Merge
sql/item.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
2006-04-26 22:35:40 +04:00
unknown
19cae2e699 Merge mysql.com:/home/jimw/my/mysql-5.0-16195
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict
2006-04-26 11:34:45 -07:00
unknown
7ab5d5a75e Merge mysql.com:/home/jimw/my/mysql-5.0-19083
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
2006-04-26 11:32:53 -07:00
unknown
5bbd943758 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2006-04-26 10:24:47 -07:00
unknown
494ac21dc9 merged ul 2006-04-26 10:10:31 -07:00