summaryrefslogtreecommitdiff
path: root/vio
Commit message (Expand)AuthorAgeFilesLines
* Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-061-1/+1
* 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
|\
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-mdmsvensson@neptunus.(none)2006-05-127-483/+291
| |\
| | * 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
| | |\
| * | | 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
|\ \ \ \ | |/ / /
| * | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ...reggie@big_geek.2006-05-111-0/+0
| |/ /
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2006-05-097-485/+291
|\ \ \ | |/ / |/| / | |/
| * Remove valgrind and compiler warningsmsvensson@neptunus.(none)2006-05-085-6/+19
| * Fix warningsmsvensson@neptunus.(none)2006-05-042-30/+32
| * Load CA certs before setting local certs.msvensson@neptunus.(none)2006-05-032-18/+29
| * Bug#17208 SSL: client does not verify server certificatemsvensson@neptunus.(none)2006-04-181-4/+4
| * 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
| |\
| | * Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-104-446/+229
* | | Added support for key_block_size for key and table level (WL#602)monty@mysql.com2006-05-031-1/+9
* | | 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
* | | | 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
|\
| * 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
* | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-11-253-21/+1
|\ \ | |/
| * 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
|\ \
| * | Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linkingmsvensson@neptunus.(none)2005-10-181-5/+5
* | | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2005-10-131-1/+1
|\ \ \ | | |/ | |/|
| * | 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
|\ \ \ | |/ /
| * | Fix wait_timeout (and kill) handling on Mac OS X by cleaning up howjimw@mysql.com2005-10-112-5/+20
* | | Merge moonbone.local:/work/12887-bug-4.1-mysqlevgen@moonbone.local2005-09-151-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Merge mysql.com:/home/jimw/my/mysql-4.1-12723jimw@mysql.com2005-09-151-1/+1
| |\
| | * 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
|\ \ \ | |/ /
| * | 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
| |\ \ | | |/ | |/|
| | * Fixes bug #5588. vio_was_interrupted() function was added to detectSergeyV@selena.2005-08-302-0/+11
* | | Bug #11286 yassl incompatible with "load data infile"msvensson@neptunus.(none)2005-09-012-9/+4
* | | Merge mysql.com:/home/bkroot/mysql-4.1lars@mysql.com2005-07-132-4/+4
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-07-061-1/+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
| |/ /
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-201-0/+1
|\ \ \ | |/ /