cmiller@zippy.cornsilk.net
896e2623eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01:00
tsmith/tim@siva.hindu.god
682596d7ce
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-26 22:28:28 -07:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
msvensson@pilot.mysql.com
945c35eee9
Bug#24148 regression tests hang with SSL enabled
...
- Don't call SSL_shutdown a second time
2006-12-22 00:05:40 +01:00
msvensson@neptunus.(none)
04d5a42bbf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
bf020e5ea6
Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs
...
- Most likely caused by linking with libmysqlclient using gcc and not g++.
- Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
with gcc
- Remove build of non working test programs in vio
2006-11-13 17:16:37 +01:00
msvensson@neptunus.(none)
ffa100d2d0
Bug#23981 memory leaks from yassl code + other
...
- Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails. As in the "ssl_des"
test case where the server is currently not supposed to be able to read the specific cert/key file.
- Change error message to be generic as it's called both from server and client code.
2006-11-07 15:20:24 +01:00
msvensson@neptunus.(none)
25abce028e
When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped
2006-10-24 10:43:15 +02:00
msvensson@neptunus.(none)
82b6ac52e5
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-16 17:08:16 +02:00
cmiller@zippy.cornsilk.net
adea21fd1c
Merge fix-up.
2006-10-13 10:57:50 -04:00
cmiller@zippy.cornsilk.net
87ba07e832
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
2006-10-13 08:57:15 -04:00
cmiller@zippy.cornsilk.net
cd71add6f2
The behavior of "%p" varies. We prefer "0x%lx".
2006-10-03 13:40:55 -04:00
msvensson@neptunus.(none)
3135940c25
Reduce code for SSL_connect and SSL_accept
...
There is no need to call SSL_set_accept_state + SSL_do_handshake when we know that SSL_accept should be done.
2006-09-28 16:21:21 +02:00
msvensson@shellback.(none)
cebd7d9d67
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 14:31:25 +02:00
msvensson@shellback.(none)
c4177ec484
Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown
2006-09-15 14:27:45 +02:00
cmiller@zippy.cornsilk.net
a724e20c74
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-13 09:37:38 -04:00
cmiller@zippy.cornsilk.net
c02308a729
Fix initialized memory. Count the number of failures in shm-closing
...
functions and return it.
2006-09-08 11:39:03 -04:00
grichter@bk-internal.mysql.com
6993e3a3f7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e
make dist changes for Cmake build
2006-09-01 10:32:12 +02:00
tsmith@maint2.mysql.com
e2f40aa6d0
Merge maint2.mysql.com:/data/localhome/tsmith/bk/41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/50
2006-09-01 08:53:56 +02:00
georg@lmy002.wdf.sap.corp
27636d9303
Additional files for cmake support
2006-08-31 19:52:42 +02:00
kroki/tomash@moonlight.intranet
c746c08af9
BUG#9678: Client library hangs after network communication failure
...
Socket timeouts in client library were used only on Windows.
The solution is to use socket timeouts in client library on all
systems were they are supported.
No test case is provided because it is impossible to simulate network
failure in current test suit.
2006-08-14 20:01:19 +04:00
msvensson@shellback.(none)
20217ba36f
Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
...
- Include prefix files that renames all public functions in yaSSLs
OpenSSL API to ya<function_name>. They will otherwise conflict
with OpenSSL functions if loaded by an application that uses OpenSSL
as well as libmysqlclient with yaSSL support.
2006-05-31 16:19:06 +02:00
msvensson@neptunus.(none)
b60540a862
Remove valgrind and compiler warnings
...
Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
2006-05-08 17:14:06 +02:00
msvensson@neptunus.(none)
697069af2c
Fix warnings
2006-05-04 10:30:08 +02:00
msvensson@neptunus.(none)
e1b41812b7
Load CA certs before setting local certs.
...
Make it possible to get the yaSSL error message printed in the DBUG log file.
2006-05-03 14:09:08 +02:00
msvensson@neptunus.(none)
a51668c74c
Bug#17208 SSL: client does not verify server certificate
...
- Add new function 'ssl_verify_server_cert' which is used if we are
connecting to the server with SSL. It will compare the hostname in
the server's cert against the hostname that we used when connecting
to the server. Will reject the connection if hostname does not match.
- Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
which will turn on checking of servers cert.
- Add new argument "ssl-verify-server-cert" to all mysql* clients which
will activate the above option.
- Generate a new server cert with 1024 bits that has "localhost" as the server name.
2006-04-18 17:58:27 +02:00
msvensson@neptunus.(none)
d66ac94911
Fix up patch
2006-04-12 14:06:05 +02:00
msvensson@neptunus.(none)
e5712d8413
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
2006-04-12 12:52:34 +02:00
cmiller@calliope.local
34638c283a
No longer leak file descriptors in mysql_close. Fixes Bug#15846.
2006-03-17 18:46:34 +01:00
msvensson@neptunus.(none)
aa3abd1550
Cleanup SSL implementation
...
Remove duplicate code
Merge common functions
Enforce MySQL coding standard
2006-03-10 16:41:14 +01:00
jimw@mysql.com
f8afbe6f0c
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-29 15:33:58 -08:00
gluh@eagle.intranet.mysql.r18.ru
4b6a94ffb4
Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
...
added SSL_library_init()
2005-11-29 12:15:48 +04:00
konstantin@mysql.com
9fd6204ad1
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 13:57:13 +03:00
gluh@eagle.intranet.mysql.r18.ru
f0f8b9c658
Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled
2005-11-21 16:09:26 +04:00
msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
0684dc1342
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
2005-10-18 15:43:59 +02:00
monty@mysql.com
6f5baa1eba
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-10-13 20:18:37 +03:00
monty@mysql.com
829a4831b1
Fixes during review of new code
2005-10-13 19:24:01 +03:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
jimw@mysql.com
c8a6c2c614
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
...
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 )
2005-10-11 09:12:12 -07:00
evgen@moonbone.local
7e733a889e
Merge moonbone.local:/work/12887-bug-4.1-mysql
...
into moonbone.local:/work/12887-bug-5.0-mysql
2005-09-15 22:54:59 +04:00
jimw@mysql.com
af4d71f734
Merge mysql.com:/home/jimw/my/mysql-4.1-12723
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-15 10:00:25 -07:00
jimw@mysql.com
a60ed0b75d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 17:00:50 -07:00
SergeyV@selena.
33c3fedadc
Fixes bug #5588 . Additions after merge from 4.0.
2005-09-07 15:57:14 +04:00
SergeyV@selena.
784582b857
Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
...
into selena.:H:/MYSQL/src/#05588-mysql-4.1
2005-09-07 14:59:41 +04:00
msvensson@neptunus.(none)
8c0f7f82d9
Bug #11286 yassl incompatible with "load data infile"
...
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
jimw@mysql.com
89decf6aa9
Fix shared memory connection handling on Windows. (Bug #12723 )
2005-08-31 15:04:25 -07:00