Commit graph

30216 commits

Author SHA1 Message Date
unknown
34fdbcbf3f Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.


innobase/include/dict0dict.ic:
  Null-merge.
2006-05-03 23:29:27 +04:00
unknown
219d5cf225 Applied innodb-4.1-ss26 snapshot.
Fixed BUG#19366: "consistent_snapshot.test fails".


innobase/include/dict0dict.ic:
  Applied innodb-4.1-ss26 snapshot.
   Remove too strict assertions from some dict_table_t
   accessor functions (Bug#19366).
2006-05-03 23:25:01 +04:00
unknown
f0c693cc86 Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.mrg


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-05-04 00:03:58 +05:00
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
a1e9539b62 merging fix 2006-05-03 19:01:29 +05:00
unknown
184ae8820e Move "max-connect-retries" option to get alpabetichal order 2006-05-03 15:53:59 +02:00
unknown
66edfe285a merging fix 2006-05-03 17:43:32 +05: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
7d121a7fd5 Merge mysql.com:/home/hf/work/mysql-5.0.18455
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-03 16:48:15 +05:00
unknown
2304a588e1 merging
mysql-test/t/sp_notembedded.test:
  Auto merged
2006-05-03 16:47:05 +05:00
unknown
83c8e2c910 merging
sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-05-03 16:42:39 +05:00
unknown
7f1cc13802 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
2006-05-03 16:37:42 +05:00
unknown
8cec2f3e20 Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
2006-05-03 16:36:00 +05:00
unknown
0a9c02f106 merging
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/analyze.result:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2006-05-03 16:33:42 +05: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
159d9125a3 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2006-05-03 14:10:33 +03: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
050a9f3f3f Merge hf@192.168.21.28:work/mysql-4.1.16892
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:53:36 +05:00
unknown
f4c6c0ed40 Merge mysql.com:/home/hf/work/mysql-4.1.15442
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:52:07 +05:00
unknown
bb95643f73 Merge mysql.com:/home/hf/work/mysql-4.1.15225
into mysql.com:/home/hf/work/mysql-4.1.mrg


sql/sql_table.cc:
  Auto merged
2006-05-03 15:51:19 +05: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
21d61c2be7 Fixed bug #14292: performance degradation for a benchmark query.
This performance degradation was due to the fact that some
cost evaluation code added into 4.1 in the function find_best was
not merged into the code of the function best_access_path added
together with other code for greedy optimizer.
Added a parameter to the function print_plan. The parameter contains
accumulated cost for a given partial join.
 
The patch does not include a special test case since this performance
degradation is hard to reproduse with a simple example.

TODO: make the function find_best use the function best_access_path
in order to remove duplication of code which might result in incomplete
merges in the future.


mysql-test/r/delete.result:
  Fixed bug #14292: performance degradation for a benchmark query.
  Adjusted test results.
mysql-test/r/subselect.result:
  Fixed bug #14292: performance degradation for a benchmark query.
  Adjusted test results.
sql/mysql_priv.h:
  Fixed bug #14292: performance degradation for a benchmark query.
  Added a parameter to the function print_plan. The parameter contains
  accumulated cost for a given partial join.
sql/sql_select.cc:
  Fixed bug #14292: performance degradation for a benchmark query.
  This performance degradation was due to the fact that some
  cost evaluation code added into 4.1 in the function find_best was
  not merged into the code of the function best_access_path added
  together with other code for greedy optimizer.
sql/sql_test.cc:
  Fixed bug #14292: performance degradation for a benchmark query.
  Added a parameter to the function print_plan. The parameter contains
  accumulated cost for a given partial join.
2006-05-02 18:31:20 -07:00
unknown
b06e6127f6 pekka:get - push push push
BitKeeper/etc/config:
  pekka:get
2006-05-02 21:47:53 +02:00
unknown
af075e2245 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
2006-05-02 15:08:47 -04:00
unknown
28d799f100 An update to as-yet unused new feature of snprintf, which was added to bring
our sprintf()-alike in sync with our fprintf()-alike features.


strings/my_vsnprintf.c:
  Advance the destination pointer properly.
  
  Also, pay attention to the "n" in snprintf() -- never write too much.
2006-05-02 13:42:35 -04:00
unknown
853f5413f6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/mysql-5.0-bg11081
2006-05-02 17:07:23 +04: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
e93b203d08 ndb - bug#19201 (4.1), see comment in NdbBlob.cpp
ndb/test/ndbapi/testBlobs.cpp:
  option -fac (fetch across commit)
ndb/tools/delete_all.cpp:
  option --transactional (default remains truncate)
mysql-test/r/ndb_blob.result:
  bug#19201
mysql-test/t/ndb_blob.test:
  bug#19201
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  bug#19201
ndb/include/ndbapi/NdbBlob.hpp:
  bug#19201
ndb/src/ndbapi/NdbBlob.cpp:
  bug#19201
2006-05-02 14:33:55 +02:00
unknown
094a738c06 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug10405
2006-05-02 11:51:40 +02:00
unknown
942fcb56ce Merge mysql.com:/home/mydev/mysql-4.1-bug10405
into  mysql.com:/home/mydev/mysql-5.0-bug10405


myisam/mi_check.c:
  Auto merged
2006-05-02 11:01:38 +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
33417297c5 Fix a bunch of non-Linux compile failures.
VC++Files/mysql.sln:
  mysql_client_test depends on mysys.
VC++Files/mysys/mysys.vcproj:
  Add new file missing in previous push.
mysys/my_memmem.c:
  Fix illegal pointer arithmetics on void *.
tests/Makefile.am:
  -L must go before -l
tests/mysql_client_test.c:
  No declarations after statement in C code.
2006-05-02 09:19:54 +02:00
unknown
7400f10a88 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b7643


sql/sql_table.cc:
  Auto merged
2006-05-02 11:33:26 +05:00
unknown
a829565457 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.clean
2006-05-02 09:01:13 +05:00
unknown
521d6b3dab Win build fix 2006-05-02 08:59:49 +05:00
unknown
4d1cd02ef6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667


mysys/Makefile.am:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-05-01 22:50:36 -04:00
unknown
3010890e58 SECURITY FIX
Bug#17667: An attacker has the opportunity to bypass query logging.

This adds a new, local-only printf format specifier to our *printf functions
that allows us to print known-size buffers that must not be interpreted as 
NUL-terminated "strings."

It uses this format-specifier to print to the log, thus fixing this 
problem.


include/my_sys.h:
  Add prototype for my_memmem() .
mysys/Makefile.am:
  Add reference to new file, my_memmem.c
mysys/mf_iocache2.c:
  Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
  but unlike the string-indicator, it requires the width and doesn't stop printing
  at NUL characters.
  
  Also, simplify the code a bit.
  
  TODO:  This code should be unified with the strings/my_vnsprintf.c code in 
  the future.
sql/sql_parse.cc:
  The query is not a C-string, but is a sized buffer, containing any character 
  at all, which may include NUL characters.
strings/my_vsnprintf.c:
  Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
  but unlike the string-indicator, it requires the width and doesn't stop printing
  at NUL characters.
tests/Makefile.am:
  We may need some of our local functions.
tests/mysql_client_test.c:
  Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
  but unlike the string-indicator, it requires the width and doesn't stop printing
  at NUL characters.
mysql-test/t/mysql_client_test.opt:
  New BitKeeper file ``mysql-test/t/mysql_client_test.opt''
  
  Add '--log' server parameter.
mysys/my_memmem.c:
  New BitKeeper file ``mysys/my_memmem.c''
  
  Implement memmem, a black-box work-alike of the GNU memmem(), which functions
  like strstr() but for arbitrary blocks of memory.
2006-05-01 22:10:50 -04:00