Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Re-apply missing changeset, orignally pushed by elliot | monty@mysql.com | 2006-06-06 | 1 | -1/+1 |
* | Merge from 5.0 to 5.1. Third part with fixes. | jani@ua141d10.elisa.omakaista.fi | 2006-05-31 | 1 | -8/+15 |
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new | jani@a193-229-222-105.elisa-laajakaista.fi | 2006-05-12 | 1 | -1/+1 |
|\ | |||||
| * | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md | msvensson@neptunus.(none) | 2006-05-12 | 7 | -483/+291 |
| |\ | |||||
| | * | Fix after merge 5.0->5.1 | msvensson@neptunus.(none) | 2006-05-12 | 1 | -1/+1 |
| | * | Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge | msvensson@neptunus.(none) | 2006-05-12 | 7 | -482/+290 |
| | |\ | |||||
| * | | | Rename cmakelists.txt -> CMakeLists.txt | msvensson@neptunus.(none) | 2006-05-12 | 1 | -1/+1 |
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new | jani@a193-229-222-105.elisa-laajakaista.fi | 2006-05-12 | 1 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ... | reggie@big_geek. | 2006-05-11 | 1 | -0/+0 |
| |/ / | |||||
* | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 | jani@ua141d10.elisa.omakaista.fi | 2006-05-09 | 7 | -485/+291 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Remove valgrind and compiler warnings | msvensson@neptunus.(none) | 2006-05-08 | 5 | -6/+19 |
| * | 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 |
| * | Bug#17208 SSL: client does not verify server certificate | msvensson@neptunus.(none) | 2006-04-18 | 1 | -4/+4 |
| * | 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 |
| |\ | |||||
| | * | Cleanup SSL implementation | msvensson@neptunus.(none) | 2006-03-10 | 4 | -446/+229 |
* | | | Added support for key_block_size for key and table level (WL#602) | monty@mysql.com | 2006-05-03 | 1 | -1/+9 |
* | | | Final patch to remove the last of the OS2 support. | brian@zim.(none) | 2006-04-15 | 3 | -13/+9 |
* | | | Manual merge. | knielsen@mysql.com | 2006-03-28 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Some changes to make it possible to build for Windows with CMake from | knielsen@mysql.com | 2006-03-24 | 1 | -0/+1 |
* | | | | 5.0 -> 5.1 merge | gluh@mysql.com | 2006-03-21 | 1 | -8/+14 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | No longer leak file descriptors in mysql_close. Fixes Bug#15846. | cmiller@calliope.local | 2006-03-17 | 1 | -8/+14 |
| |/ | |||||
* | | Moved cmake scripts into the proper directories | Reggie@xgeek. | 2006-03-15 | 1 | -0/+6 |
|/ | |||||
* | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-11-29 | 1 | -11/+10 |
|\ | |||||
| * | 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 |
* | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2005-11-25 | 3 | -21/+1 |
|\ \ | |/ | |||||
| * | 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 |
|\ \ | |||||
| * | | Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking | msvensson@neptunus.(none) | 2005-10-18 | 1 | -5/+5 |
* | | | Merge mysql.com:/home/my/mysql-4.1 | monty@mysql.com | 2005-10-13 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 |
|\ \ \ | |/ / | |||||
| * | | Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how | jimw@mysql.com | 2005-10-11 | 2 | -5/+20 |
* | | | Merge moonbone.local:/work/12887-bug-4.1-mysql | evgen@moonbone.local | 2005-09-15 | 1 | -1/+1 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-12723 | jimw@mysql.com | 2005-09-15 | 1 | -1/+1 |
| |\ | |||||
| | * | 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 |
|\ \ \ | |/ / | |||||
| * | | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | Fixes bug #5588. vio_was_interrupted() function was added to detect | SergeyV@selena. | 2005-08-30 | 2 | -0/+11 |
* | | | Bug #11286 yassl incompatible with "load data infile" | msvensson@neptunus.(none) | 2005-09-01 | 2 | -9/+4 |
* | | | Merge mysql.com:/home/bkroot/mysql-4.1 | lars@mysql.com | 2005-07-13 | 2 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | 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 |
|\ \ \ | |/ / | |||||
| * | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 | brian@zim.(none) | 2005-07-06 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Typo for debug code. Bug #11705 | brian@zim.(none) | 2005-07-06 | 1 | -1/+1 |
* | | | | Merge | kent@mysql.com | 2005-07-06 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Makefile.am: | kent@mysql.com | 2005-07-05 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-06-20 | 1 | -0/+1 |
|\ \ \ | |/ / |