Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Many files: | kent@mysql.com/kent-amd64.(none) | 2006-12-23 | 10 | -20/+10 |
| | | | | Changed header to GPL version 2 only | ||||
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 | msvensson@neptunus.(none) | 2006-11-28 | 3 | -22/+22 |
|\ | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * | Remove compiler warnings | monty@mysql.com/nosik.monty.fi | 2006-11-20 | 3 | -22/+22 |
| | | | | | | | | | | | | | | (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 #) | ||||
* | | Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs | msvensson@neptunus.(none) | 2006-11-13 | 1 | -26/+12 |
|/ | | | | | | | - 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 | ||||
* | Bug#23981 memory leaks from yassl code + other | msvensson@neptunus.(none) | 2006-11-07 | 1 | -4/+5 |
| | | | | | | - 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. | ||||
* | When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped | msvensson@neptunus.(none) | 2006-10-24 | 2 | -0/+9 |
| | |||||
* | Merge bk-internal:/home/bk/mysql-5.0-maint | msvensson@neptunus.(none) | 2006-10-16 | 1 | -6/+4 |
|\ | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * | Reduce code for SSL_connect and SSL_accept | msvensson@neptunus.(none) | 2006-09-28 | 1 | -6/+4 |
| | | | | | | | | There is no need to call SSL_set_accept_state + SSL_do_handshake when we know that SSL_accept should be done. | ||||
* | | Merge fix-up. | cmiller@zippy.cornsilk.net | 2006-10-13 | 1 | -2/+2 |
| | | |||||
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-10-13 | 1 | -7/+7 |
|\ \ | |/ |/| | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262 | ||||
| * | The behavior of "%p" varies. We prefer "0x%lx". | cmiller@zippy.cornsilk.net | 2006-10-03 | 1 | -7/+7 |
| | | |||||
* | | Merge shellback.(none):/home/msvensson/mysql/work/my50-work | msvensson@shellback.(none) | 2006-09-15 | 1 | -1/+1 |
|\ \ | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * | | Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown | msvensson@shellback.(none) | 2006-09-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit | cmiller@zippy.cornsilk.net | 2006-09-13 | 1 | -2/+27 |
|\ \ \ | |/ / |/| | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | ||||
| * | | Fix initialized memory. Count the number of failures in shm-closing | cmiller@zippy.cornsilk.net | 2006-09-08 | 1 | -2/+27 |
| |/ | | | | | | | functions and return it. | ||||
* | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | grichter@bk-internal.mysql.com | 2006-09-02 | 1 | -8/+22 |
|\ \ | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake | ||||
| * \ | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 | tsmith@maint2.mysql.com | 2006-09-01 | 1 | -8/+22 |
| |\ \ | | |/ | |/| | | | | into maint2.mysql.com:/data/localhome/tsmith/bk/50 | ||||
| | * | BUG#9678: Client library hangs after network communication failure | kroki/tomash@moonlight.intranet | 2006-08-14 | 1 | -8/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | make dist changes for Cmake build | georg@lmy002.wdf.sap.corp | 2006-09-01 | 1 | -1/+1 |
| | | | |||||
* | | | Additional files for cmake support | georg@lmy002.wdf.sap.corp | 2006-08-31 | 1 | -0/+6 |
|/ / | |||||
* | | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init | msvensson@shellback.(none) | 2006-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | - 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. | ||||
* | | Remove valgrind and compiler warnings | msvensson@neptunus.(none) | 2006-05-08 | 5 | -6/+19 |
| | | | | | | | | Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses. | ||||
* | | Fix warnings | msvensson@neptunus.(none) | 2006-05-04 | 2 | -30/+32 |
| | | |||||
* | | Load CA certs before setting local certs. | msvensson@neptunus.(none) | 2006-05-03 | 2 | -18/+29 |
| | | | | | | | | Make it possible to get the yaSSL error message printed in the DBUG log file. | ||||
* | | Bug#17208 SSL: client does not verify server certificate | msvensson@neptunus.(none) | 2006-04-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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. | ||||
* | | Fix up patch | msvensson@neptunus.(none) | 2006-04-12 | 2 | -13/+12 |
| | | |||||
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 | msvensson@neptunus.(none) | 2006-04-12 | 4 | -446/+229 |
|\ \ | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208 | ||||
| * | | Cleanup SSL implementation | msvensson@neptunus.(none) | 2006-03-10 | 4 | -446/+229 |
| | | | | | | | | | | | | | | | | | | Remove duplicate code Merge common functions Enforce MySQL coding standard | ||||
* | | | No longer leak file descriptors in mysql_close. Fixes Bug#15846. | cmiller@calliope.local | 2006-03-17 | 1 | -8/+14 |
|/ / | |||||
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-11-29 | 1 | -11/+10 |
|\ \ | |/ | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean | ||||
| * | Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a | gluh@eagle.intranet.mysql.r18.ru | 2005-11-29 | 1 | -11/+10 |
| | | | | | | | | added SSL_library_init() | ||||
* | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2005-11-25 | 3 | -21/+1 |
|\ \ | |/ | | | | | into mysql.com:/opt/local/work/mysql-5.0-root | ||||
| * | Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled | gluh@eagle.intranet.mysql.r18.ru | 2005-11-21 | 3 | -21/+1 |
| | | |||||
* | | Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 | msvensson@neptunus.(none) | 2005-10-28 | 1 | -5/+5 |
|\ \ | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 | ||||
| * | | Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking | msvensson@neptunus.(none) | 2005-10-18 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | - 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. | ||||
* | | | Merge mysql.com:/home/my/mysql-4.1 | monty@mysql.com | 2005-10-13 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | into mysql.com:/home/my/mysql-5.0 | ||||
| * | | Fixes during review of new code | monty@mysql.com | 2005-10-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp | jani@ua141d10.elisa.omakaista.fi | 2005-10-13 | 2 | -5/+20 |
|\ \ \ | |/ / | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 | ||||
| * | | Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how | jimw@mysql.com | 2005-10-11 | 2 | -5/+20 |
| | | | | | | | | | | | | | | | signal handlers are set up, the blocking flags for sockets are set, and which thread-related functions are used. (Bug #8731) | ||||
* | | | Merge moonbone.local:/work/12887-bug-4.1-mysql | evgen@moonbone.local | 2005-09-15 | 1 | -1/+1 |
|\ \ \ | |/ / | | / | |/ |/| | into moonbone.local:/work/12887-bug-5.0-mysql | ||||
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-12723 | jimw@mysql.com | 2005-09-15 | 1 | -1/+1 |
| |\ | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean | ||||
| | * | Fix shared memory connection handling on Windows. (Bug #12723) | jimw@mysql.com | 2005-08-31 | 1 | -1/+1 |
| | | | |||||
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-09-12 | 4 | -0/+24 |
|\ \ \ | |/ / | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean | ||||
| * | | Fixes bug #5588. Additions after merge from 4.0. | SergeyV@selena. | 2005-09-07 | 4 | -3/+16 |
| | | | |||||
| * | | Merge selena.:H:/MYSQL/src/#05588-mysql-4.0 | SergeyV@selena. | 2005-09-07 | 2 | -0/+11 |
| |\ \ | | |/ | |/| | | | | into selena.:H:/MYSQL/src/#05588-mysql-4.1 | ||||
| | * | Fixes bug #5588. vio_was_interrupted() function was added to detect | SergeyV@selena. | 2005-08-30 | 2 | -0/+11 |
| | | | | | | | | | | | | read timeout properly on win32. | ||||
* | | | Bug #11286 yassl incompatible with "load data infile" | msvensson@neptunus.(none) | 2005-09-01 | 2 | -9/+4 |
| | | | | | | | | | | | | | | | - Make sure that mysqltest always uses ssl when connecting to the server. - Pass a i32-bit int variable as argument to FIONREAD ioctl. | ||||
* | | | Merge mysql.com:/home/bkroot/mysql-4.1 | lars@mysql.com | 2005-07-13 | 2 | -4/+4 |
|\ \ \ | |/ / | | | | | | | into mysql.com:/home/bk/mysql-5.0 | ||||
| * | | Fixed some vio code that was using ___WIN__ instead of __WIN__ | reggie@linux.site | 2005-07-12 | 2 | -4/+4 |
| | | | |||||
* | | | Merge mysql.com:/usr/home/bar/mysql-4.1 | bar@mysql.com | 2005-07-12 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0 |