summaryrefslogtreecommitdiff
path: root/vio/viossl.c
Commit message (Collapse)AuthorAgeFilesLines
* Merging with mysql-5.5-stage.Mats Kindahl2010-08-161-1/+4
|\
| * WL#5363: Thread Pool Service InterfaceMats Kindahl2010-06-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to allow thread schedulers to be dynamically loaded, it is necessary to make the following changes to the server: - Two new service interfaces - Modifications to InnoDB to inform the thread scheduler of state changes. - Changes to the VIO subsystem for checking if data is available on a socket. - Elimination of remains of the old thread pool implementation. The two new service interfaces introduces are: my_thread_scheduler A service interface to register a thread scheduler. thd_wait A service interface to inform thread scheduler that the thread is about to start waiting. In addition, the patch adds code that: - Add a call to thd_wait for table locks in mysys thd_lock.c by introducing a set function that can be used to set a callback to be used when waiting on a lock and resuming from waiting. - Calling the mysys set function from the server to set the callbacks correctly.
* | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-30/+0
|/ | | Remove Netware specific code.
* Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988msvensson@pilot.mysql.com2008-02-071-14/+21
|\ | | | | | | into pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988
| * Bug#33050 5.0.50 fails many SSL testcasesmsvensson@pilot.mysql.com2008-02-071-14/+21
| |
* | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.(none)2007-08-281-96/+46
|\ \ | |/ | | | | into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
| * Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117msvensson@pilot.(none)2007-08-281-96/+46
| | | | | | | | | | | | | | | | - Merge sslaccept and sslconnect. - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has succeeded, this avoids having to revert anything and thus protects against "close_active_vio" in the middle. - Add some variance to the testcase
* | Merge damien-katzs-computer.local:/Users/dkatz/mysql50dkatz@damien-katzs-computer.local2007-07-121-0/+10
|\ \ | |/ | | | | into damien-katzs-computer.local:/Users/dkatz/mysql51
| * Bug #29579 Clients using SSL can hang the serverdkatz@damien-katzs-computer.local2007-07-121-0/+10
| | | | | | | | Added an option to yassl to allow "quiet shutdown" like openssl does. This option causes the SSL libs to NOT perform the close_notify handshake during shutdown. This fixes a hang we experience because we hold a lock during socket shutdown.
* | WL#3817: Simplify string / memory area types and make things more consistent ↵monty@mysql.com/narttu.mysql.fi2007-05-101-13/+13
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (first part) The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c
* Bug#25203 Mysql crashes when mysql_kill() is executed in a connection using SSLmsvensson@shellback.(none)2007-01-261-2/+18
| | | | | | | | | - It's too early to free the SSL object in 'vio_ssl_close'. There might still be a thread using or reading from it on platforms where we need to close the active connection/socket in order to break the read. - Add new function 'vio_ssl_delete' and install it as the viodelete function for SSL connections.
* Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-261-2/+1
|\ | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/50
| * Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | | | | | | | Changed header to GPL version 2 only
* | Bug#24148 regression tests hang with SSL enabledmsvensson@pilot.mysql.com2006-12-221-5/+9
|/ | | | - Don't call SSL_shutdown a second time
* Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-10/+10
| | | | | | | (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 #)
* When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skippedmsvensson@neptunus.(none)2006-10-241-0/+5
|
* Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-161-6/+4
|\ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * Reduce code for SSL_connect and SSL_acceptmsvensson@neptunus.(none)2006-09-281-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.net2006-10-131-2/+2
|/
* Fix warningsmsvensson@neptunus.(none)2006-05-041-29/+31
|
* Load CA certs before setting local certs.msvensson@neptunus.(none)2006-05-031-8/+18
| | | | Make it possible to get the yaSSL error message printed in the DBUG log file.
* Fix up patchmsvensson@neptunus.(none)2006-04-121-12/+12
|
* Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-101-246/+90
| | | | | | Remove duplicate code Merge common functions Enforce MySQL coding standard
* Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-11-251-19/+0
|\ | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabledgluh@eagle.intranet.mysql.r18.ru2005-11-211-19/+0
| |
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-121-0/+9
|\ \ | |/ | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Fixes bug #5588. Additions after merge from 4.0.SergeyV@selena.2005-09-071-0/+9
| |
* | Bug #11286 yassl incompatible with "load data infile"msvensson@neptunus.(none)2005-09-011-3/+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:/usr/home/bar/mysql-4.1bar@mysql.com2005-07-121-1/+1
|\ \ | |/ | | | | into mysql.com:/usr/home/bar/mysql-5.0
| * Typo for debug code. Bug #11705brian@zim.(none)2005-07-061-1/+1
| |
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-011-17/+28
|\ \ | |/ | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Fix timeouts with SSL on Windows, and also sync the fastsendjimw@mysql.com2005-05-241-17/+28
| | | | | | | | implementation with normal socket behavior. (Bug #8572)
* | Merge bk-internal.mysql.com:/users/rburnett/bug9721rburnett@bk-internal.mysql.com2005-05-061-1/+2
|\ \ | |/ | | | | into bk-internal.mysql.com:/users/rburnett/mysql-5.0
| * Bug #9721 net_write_timeout not used on Windows rburnett@bk-internal.mysql.com2005-05-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an extra parameter to all calls to timeout(). 1 means we want to set the write timeout 0 means we wnat to set the read timeout viossl.c: Add which parameter to ssl timeout routine vio_priv.h: Added which parameter to vio_ignore_timeout and vio_ssl_timeout violite.h: Add which parameter to vio_timeout sigs net_serv.cc: Use proper which code in call to vio_timeout to set the proper timeout viosocket.c: Set the appropriate timeout in vio_timeout
* | 4.1 -> 5.0 mergemonty@mysql.com2005-02-031-1/+1
|\ \ | |/
| * Always call vio_in_addr() so that thd->remote isjimw@mysql.com2005-01-251-1/+1
| | | | | | | | always initialized. (Bug #5569)
* | Add 0x before pointers (to help with debugging)monty@mysql.com2004-12-181-9/+12
|/ | | | | | | | Add support for VARCHAR with 1 or 2 length bytes Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly) Give error if we got problems in temporary tables during a SELECT Don't use new table generated by ALTER TABLE if index generation fails Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
* Added patches from Novellmonty@mysql.com2004-05-251-0/+25
|
* vio ssl structure renames (to get rid of ending _)monty@narttu.mysql.fi2003-08-271-48/+41
| | | | | Added TCP/IP read/write timeout for windows Check on windows if second server is started with same TCP/IP port
* Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possiblegluh@gluh.mysql.r18.ru2003-06-261-4/+2
|
* Fix to remove compiler warningsmonty@mashka.mysql.fi2003-04-281-3/+9
|
* Fix bug (273):The x509 cert issuer seems not to be checked against the CAgluh@gluh.mysql.r18.ru2003-04-161-2/+4
|
* Error code for ssl connectiongluh@gluh.(none)2002-11-051-10/+36
| | | | | | Fix bug when server hang(with SSL, with modified libmysql) Add options master-ssl-capath and master-ssl-cipher Add some error checking(SSL)
* Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tablesmonty@mashka.mysql.fi2002-09-161-51/+54
| | | | | | Fixed bug in SELECT ... ORDER BY ... LIMIT Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names Fixed hang when using --with-openssl
* Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in ↵monty@hundin.mysql.fi2002-08-171-0/+10
| | | | | | | client code) Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column. Fixed bug in pthread_mutex_trylock with HPUX 11.0
* Lots of code fixes to the replication code (especially the binary logging ↵monty@mashka.mysql.fi2002-08-081-2/+7
| | | | | | | | | | | | | | | | | | and index log file handling) Fixed bugs in my last changeset that made MySQL hard to compile. Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables. Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions Extended my_chsize() to allow one to specify a filler character. Extend vio_blocking to return the old state (This made some usage of this function much simpler) Added testing for some functions that they caller have got the required mutexes before calling the function. Use setrlimit() to ensure that we can write core file if one specifies --core-file. Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len Added variables foreign_key_checks & unique_checks. Less logging from replication code (if not started with --log-warnings) Changed that SHOW INNODB STATUS requre the SUPER privilege More DBUG statements and a lot of new code comments
* Update copyrightmonty@hundin.mysql.fi2001-12-061-16/+15
| | | | Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
* Removed unused code in VIOtonu@volk.internalnet2001-11-021-23/+1
|
* SSL fixes.tonu@volk.internalnet2001-11-011-2/+2
|
* type fixtonu@volk.internalnet2001-10-091-1/+1
|