summaryrefslogtreecommitdiff
path: root/include/violite.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge from 5.0Staale Smedseng2009-07-231-1/+9
|\
| * Bug #45770 errors reading server SSL files are printed, butStaale Smedseng2009-07-231-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not logged Errors encountered during initialization of the SSL subsystem are printed to stderr, rather than to the error log. This patch adds a parameter to several SSL init functions to report the error (if any) out to the caller. The function init_ssl() in mysqld.cc is moved after the initialization of the log subsystem, so that any error messages can be logged to the error log. Printing of messages to stderr has been retained to get diagnostic output in a client context.
* | Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50tsmith@maint1.mysql.com2007-06-151-0/+2
|\ \ | |/ | | | | into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
| * follow-up fixdf@pippilotta.erinye.com2007-06-151-0/+2
| |
* | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-051-10/+10
|\ \ | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
| * | WL#3817: Simplify string / memory area types and make things more consistent ↵monty@mysql.com/narttu.mysql.fi2007-05-101-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-1/+0
|\ \ \ | |/ / |/| / | |/ into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
| * Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | - The "mysql client in mysqld"(which is used by replication and federated) should use alarms instead of setting socket timeout value if the rest of the server uses alarm. By always calling 'my_net_set_write_timeout' or 'my_net_set_read_timeout' when changing the timeout value(s), the selection whether to use alarms or timeouts will be handled by ifdef's in those two functions. - Move declaration of 'vio_timeout' into "vio_priv.h"
* | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-281-0/+3
|\ \ | |/ | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * Set yaSSL to use same type as MySQL do for socket handlesmsvensson@pilot.blaudden2007-03-281-0/+3
| |
* | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | | | | | | | Changed header to GPL version 2 only
| * Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of ↵msvensson@shellback.(none)2006-05-311-0/+1
| | | | | | | | prefix_*.h files
* | Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add define YASSL_PREFIX when compiling yassl Import patch from yaSSL - avoid allocating memory for each call to 'EVP_md5' and 'EVP_des_ede3_cbc' which were not released until server was stopped - Those functions are used from the SQL function 'des_encrypt' and 'des_decrypt'. Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases - Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.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. Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c Two threads both try a shutdown sequence which creates a race to the de-init/free of certain resources. This exists in similar form in the client as 17926: "mysql.exe crashes when ctrl-c is pressed in windows." Update after merge to 5.0 BUG#18669: Session COM_STATISTICS breaks mysqladmin status. Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens. - In function 'handle_grant_struct' when searching the memory structures for an entry to modify, convert all entries here host.hostname is NULL to "" and compare that with the host passed in argument "user_from". - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means that "any host" can connect. Thus is's correct to turn on allow_all_hosts when such a user is found. - Review and fix other places where host.hostname may be NULL. BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated Removed duplication (not a user-visible change)
* | Some fixes that were not done in original merge, compilation revealed.jani@a193-229-222-105.elisa-laajakaista.fi2006-05-111-1/+1
| |
* | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2006-05-091-16/+9
|\ \ | |/ | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
| * Remove valgrind and compiler warningsmsvensson@neptunus.(none)2006-05-081-0/+4
| | | | | | | | Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
| * Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-101-16/+5
| | | | | | | | | | | | Remove duplicate code Merge common functions Enforce MySQL coding standard
* | Added support for key_block_size for key and table level (WL#602)monty@mysql.com2006-05-031-0/+1
|/ | | | | | | | Added support for key_block_size to MyISAM. Simplify interface to 'new Key' to make it easier to add new key options. mysqld option --new is used to define where key options are printed. (In 5.3 we should move all key options to after key part definition to avoid problem with reserved names) Fixed some compiler warnings and a memory leak in ssl
* Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-121-0/+4
|\ | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Merge selena.:H:/MYSQL/src/#05588-mysql-4.0SergeyV@selena.2005-09-071-0/+4
| |\ | | | | | | | | | into selena.:H:/MYSQL/src/#05588-mysql-4.1
| | * Fixes bug #5588. vio_was_interrupted() function was added to detectSergeyV@selena.2005-08-301-0/+4
| | | | | | | | | | | | read timeout properly on win32.
* | | Merge bk-internal.mysql.com:/users/rburnett/bug9721rburnett@bk-internal.mysql.com2005-05-061-3/+3
|\ \ \ | |/ / | | | | | | 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-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | WL#2286 Compile MySQL w/YASSL supportsvoj@mysql.com2005-04-281-0/+1
| | | | | | | | | | | | yaSSL-0.9.7 library bundled.
* | | Mergeramil@mysql.com2005-03-301-2/+2
|\ \ \ | |/ /
| * | Fedora now defines read(2)/write(2) as macros.serg@serg.mylan2005-03-291-2/+2
| | | | | | | | | | | | Argh!
* | | Porting of "buffered read" patch to 5.0 and post-review fixes.konstantin@mysql.com2005-03-061-6/+14
|/ / | | | | | | | | | | | | | | The patch implements the idea suggested by Olaf van der Spek in thread "Client: many small reads?" (internals@lists.mysql.com). Now small reads performed by the client library are buffered. The buffering gives up to 2 times speedup when retrieving one-column tables.
* | fix indentationwax@kishkin.ru2004-12-231-11/+11
| | | | | | | | | | | | add space after comma add space after equal add comments in vio_close_shared_memory()
* | BUG#6056 wax@kishkin.ru2004-12-141-1/+3
| | | | | | | | | | | | | | | | | | (continue) added event_conn_closed replaced WaitForSingleObject on WaitForMultipleObjects inserted a check in vio_close() added SetEvent() for event_conn_closed
* | Merge with 4.0.21monty@mysql.com2004-06-181-0/+8
|\ \ | |/
| * Fixed issue 'the definition of macro DES_ede3_cbc_encrypt is corrupt'gluh@gluh.mysql.r18.ru2004-06-171-1/+1
| |
| * Fixed issue with compilation MySQL with OpenSSL gluh@gluh.mysql.r18.ru2004-06-091-0/+8
| | | | | | | | | | if OpenSSL is installed in non-statndart directory ('openssl/opensslv.h: No such file or directory')
* | Add read_rnd_buffer_size in my.cnf example filesmonty@mysql.com2004-05-101-8/+2
| | | | | | | | Remove wrong redefine of vio_reset() (to compile libmysqld on windows)
* | Merge key cache structures to onemonty@mysql.com2003-11-201-1/+1
| | | | | | | | Fixed compiler warnings (IRIX C compiler and VC++)
* | merge with 4.0.15monty@narttu.mysql.fi2003-08-291-132/+70
|\ \ | |/
| * vio ssl structure renames (to get rid of ending _)monty@narttu.mysql.fi2003-08-271-103/+41
| | | | | | | | | | Added TCP/IP read/write timeout for windows Check on windows if second server is started with same TCP/IP port
* | SCRUMhf@deer.(none)2003-07-041-2/+1
| | | | | | | | | | | | Including client code into embedded library Code trimming (fixes of comments etc)
* | SCRUMhf@deer.(none)2003-06-171-2/+2
| | | | | | | | | | | | | | | | client capabilities included into libmysqld some API methods became "virtual" lots of duplicated code removed IMHO all the above made library's code way more pleasant to look at, didn't it?
* | Merge with 4.0.13monty@narttu.mysql.fi2003-05-191-2/+2
|\ \ | |/
| * Fix to remove compiler warningsmonty@mashka.mysql.fi2003-04-281-2/+2
| |
* | Merge with 4.0monty@narttu.mysql.fi2003-03-161-3/+3
|\ \ | |/
| * postmerging fix (SCRUM)bell@sanja.is.com.ua2003-02-271-2/+2
| |
| * client port number added to SHOW PROCESSLIST (SCRUM?)bell@sanja.is.com.ua2003-02-171-2/+2
| |
* | After merge fixmonty@mashka.mysql.fi2003-02-041-2/+5
| |
* | Fix for windows specific errorsvenu@myvenu.com2003-01-281-1/+1
| |
* | Mergemonty@mashka.mysql.fi2003-01-211-1/+2
|\ \
| * | Portability fixes (for windows)monty@mashka.mysql.fi2003-01-211-1/+2
| | | | | | | | | | | | Some changes to the prepared statement protocol to make it easier to use and faster.
* | | Big purge about embedded library (scrum)hf@deer.mysql.r18.ru2002-12-161-5/+1
| | |
* | | Pull conflicts resolutionshf@genie.(none)2002-11-291-1/+5
|\ \ \ | |/ / |/| |