summaryrefslogtreecommitdiff
path: root/vio
Commit message (Collapse)AuthorAgeFilesLines
* Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-061-1/+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)
* Merge from 5.0 to 5.1. Third part with fixes.jani@ua141d10.elisa.omakaista.fi2006-05-311-8/+15
|
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@a193-229-222-105.elisa-laajakaista.fi2006-05-121-1/+1
|\ | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-mdmsvensson@neptunus.(none)2006-05-127-483/+291
| |\ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| | * Fix after merge 5.0->5.1msvensson@neptunus.(none)2006-05-121-1/+1
| | |
| | * Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_mergemsvensson@neptunus.(none)2006-05-127-482/+290
| | |\ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| * | | Rename cmakelists.txt -> CMakeLists.txtmsvensson@neptunus.(none)2006-05-121-1/+1
| | | |
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@a193-229-222-105.elisa-laajakaista.fi2006-05-121-0/+0
|\ \ \ \ | |/ / / | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
| * | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ↵reggie@big_geek.2006-05-111-0/+0
| |/ / | | | | | | | | | | | | | | | mixed case filenames since this seems to be required with Cmake 2.4 beta 1. This is being pushed to a private tree and tested before being sent to the mainline.
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2006-05-097-485/+291
|\ \ \ | |/ / |/| / | |/ into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
| * Remove valgrind and compiler warningsmsvensson@neptunus.(none)2006-05-085-6/+19
| | | | | | | | Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
| * Fix warningsmsvensson@neptunus.(none)2006-05-042-30/+32
| |
| * Load CA certs before setting local certs.msvensson@neptunus.(none)2006-05-032-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 certificatemsvensson@neptunus.(none)2006-04-181-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 patchmsvensson@neptunus.(none)2006-04-122-13/+12
| |
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-04-124-446/+229
| |\ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
| | * Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-104-446/+229
| | | | | | | | | | | | | | | | | | 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-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Final patch to remove the last of the OS2 support. brian@zim.(none)2006-04-153-13/+9
| | |
* | | Manual merge.knielsen@mysql.com2006-03-281-0/+1
|\ \ \
| * | | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-241-0/+1
| | | | | | | | | | | | | | | | a normal 'make dist' source .tar.gz.
* | | | 5.0 -> 5.1 mergegluh@mysql.com2006-03-211-8/+14
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | No longer leak file descriptors in mysql_close. Fixes Bug#15846.cmiller@calliope.local2006-03-171-8/+14
| |/
* | Moved cmake scripts into the proper directoriesReggie@xgeek.2006-03-151-0/+6
|/
* Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-11-291-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.8agluh@eagle.intranet.mysql.r18.ru2005-11-291-11/+10
| | | | | | | | added SSL_library_init()
* | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-11-253-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 enabledgluh@eagle.intranet.mysql.r18.ru2005-11-213-21/+1
| |
* | Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985msvensson@neptunus.(none)2005-10-281-5/+5
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linkingmsvensson@neptunus.(none)2005-10-181-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.1monty@mysql.com2005-10-131-1/+1
|\ \ \ | | |/ | |/| | | | into mysql.com:/home/my/mysql-5.0
| * | Fixes during review of new codemonty@mysql.com2005-10-131-1/+1
| | |
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpjani@ua141d10.elisa.omakaista.fi2005-10-132-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 howjimw@mysql.com2005-10-112-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-mysqlevgen@moonbone.local2005-09-151-1/+1
|\ \ \ | |/ / | | / | |/ |/| into moonbone.local:/work/12887-bug-5.0-mysql
| * Merge mysql.com:/home/jimw/my/mysql-4.1-12723jimw@mysql.com2005-09-151-1/+1
| |\ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * Fix shared memory connection handling on Windows. (Bug #12723)jimw@mysql.com2005-08-311-1/+1
| | |
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-124-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-074-3/+16
| | |
| * | Merge selena.:H:/MYSQL/src/#05588-mysql-4.0SergeyV@selena.2005-09-072-0/+11
| |\ \ | | |/ | |/| | | | into selena.:H:/MYSQL/src/#05588-mysql-4.1
| | * Fixes bug #5588. vio_was_interrupted() function was added to detectSergeyV@selena.2005-08-302-0/+11
| | | | | | | | | | | | read timeout properly on win32.
* | | Bug #11286 yassl incompatible with "load data infile"msvensson@neptunus.(none)2005-09-012-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.1lars@mysql.com2005-07-132-4/+4
|\ \ \ | |/ / | | | | | | into mysql.com:/home/bk/mysql-5.0
| * | Fixed some vio code that was using ___WIN__ instead of __WIN__reggie@linux.site2005-07-122-4/+4
| | |
* | | Merge mysql.com:/usr/home/bar/mysql-4.1bar@mysql.com2005-07-121-1/+1
|\ \ \ | |/ / | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-07-061-1/+1
| |\ \ | | | | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-4.1
| | * | Typo for debug code. Bug #11705brian@zim.(none)2005-07-061-1/+1
| | | |
* | | | Mergekent@mysql.com2005-07-061-1/+2
|\ \ \ \ | |/ / /
| * | | Makefile.am:kent@mysql.com2005-07-051-1/+2
| |/ / | | | | | | | | | | | | Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-201-0/+1
|\ \ \ | |/ / | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
View Lorry Controller Status