summaryrefslogtreecommitdiff
path: root/vio
Commit message (Expand)AuthorAgeFilesLines
* Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-059-97/+100
|\
| * WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-109-97/+100
* | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-242-15/+28
|\ \ | |/ |/|
| * Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-242-15/+28
* | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-111-2/+7
|\ \ | |/
| * Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611msvensson@pilot.blaudden2007-04-111-2/+7
| |\
| | * Bug#21611 Slave can't connect when master-ssl-cipher specifiedmsvensson@pilot.blaudden2007-04-021-2/+7
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309msvensson@pilot.blaudden2007-03-291-0/+8
|\ \ \
| * \ \ Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309msvensson@pilot.blaudden2007-03-291-0/+8
| |\ \ \ | | |/ /
| | * | Bug#25309 SSL connections without CA certificate broken since MySQL 5.0.23msvensson@pilot.blaudden2007-03-281-0/+8
| | |/
* | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-0/+8
|/ /
* | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-02-063-12/+28
|\ \ | |/
| * Merge 192.168.0.5:mysql/bug25203/my50-bug25203msvensson@pilot.mysql.com2007-02-063-12/+28
| |\
| | * Bug#25203 Mysql crashes when mysql_kill() is executed in a connection using SSLmsvensson@shellback.(none)2007-01-263-12/+28
* | | Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-importmsvensson@neptunus.(none)2007-02-061-9/+14
|\ \ \ | |/ /
| * | Bug#24157 openssl_1 regression test is broken two different waysmsvensson@neptunus.(none)2007-02-061-9/+14
| |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-112-1/+16
| |\
| * \ Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-2610-20/+10
| |\ \
* | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2007-01-071-5/+9
|\ \ \ \
| * \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-261-5/+9
| |\ \ \ \
| | * \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2006-12-221-5/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug#24148 regression tests hang with SSL enabledmsvensson@pilot.mysql.com2006-12-221-5/+9
* | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-311-0/+15
* | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-311-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-312-1/+16
| | |_|/ | |/| |
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-2310-20/+10
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Many files:kent@mysql.com/kent-amd64.(none)2006-12-2310-20/+10
| |/
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-283-22/+22
| |\
* | \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-11-292-14/+14
|\ \ \
| * \ \ Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-222-14/+14
| |\ \ \ | | | |/ | | |/|
| | * | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-203-22/+22
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-131-26/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libsmsvensson@neptunus.(none)2006-11-131-26/+12
| |/
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-071-4/+5
|\ \ | |/
| * Bug#23981 memory leaks from yassl code + othermsvensson@neptunus.(none)2006-11-071-4/+5
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-242-0/+9
|\ \ | |/
| * When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skippedmsvensson@neptunus.(none)2006-10-242-0/+9
| * Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-161-6/+4
| |\
* | \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016cmiller@zippy.cornsilk.net2006-10-171-2/+2
|\ \ \ | |/ /
| * | Merge fix-up.cmiller@zippy.cornsilk.net2006-10-131-2/+2
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-10-131-7/+7
| |\ \
| | * | The behavior of "%p" varies. We prefer "0x%lx".cmiller@zippy.cornsilk.net2006-10-031-7/+7
* | | | Merge neptunus.(none):/home/msvensson/mysql/work/my50-workmsvensson@neptunus.(none)2006-09-281-6/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Reduce code for SSL_connect and SSL_acceptmsvensson@neptunus.(none)2006-09-281-6/+4
| |/ /
| * | Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-151-1/+1
| |\ \
| * \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninitcmiller@zippy.cornsilk.net2006-09-131-2/+27
| |\ \ \
* | \ \ \ Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-151-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdownmsvensson@shellback.(none)2006-09-151-1/+1
| |/ / /
| * | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0grichter@bk-internal.mysql.com2006-09-021-8/+22
| |\ \ \
| | * \ \ Merge maint2.mysql.com:/data/localhome/tsmith/bk/41tsmith@maint2.mysql.com2006-09-011-8/+22
| | |\ \ \ | | | |_|/ | | |/| |