summaryrefslogtreecommitdiff
path: root/vio
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-033-36/+227
|\
| * Fix typo (s/_WIN_/__WIN__).Alik2009-11-251-1/+1
| * Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-253-36/+227
* | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-0/+24
|\ \ | |/
| * Backport the implementation of vio_pending from 6.0-codebase.Konstantin Osipov2009-11-211-0/+24
* | Merge with next-mrKonstantin Osipov2009-11-203-8/+204
|\ \ | |/
| * Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-193-8/+204
| |\
| | * The FIONREAD macro could expand to a expression whichDavi Arnaut2009-11-101-1/+2
| | * Backport of Bug#41860 to mysql-next-mrDavi Arnaut2009-11-103-7/+160
| | * Backport of Bug#10374 to mysql-next-mrDavi Arnaut2009-11-101-4/+45
* | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-59/+2
|\ \ \ | |/ /
| * | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-064-98/+115
| |\ \ | | |/ | |/|
| | * Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-59/+2
| | |\
| | | * mergeGeorgi Kodinov2009-10-271-59/+2
| | | |\
| | | | * merge from 4.1Georgi Kodinov2009-10-271-59/+2
| | | | |\
| | | | | * Bug #47320: OpenSSL client does not check YaSSL server certificateGeorgi Kodinov2009-10-201-51/+2
| | | | | * Merge 192.168.0.10:mysql/mysql-4.1-maintunknown2007-02-062-12/+1
| | | | | |\
| | | | | | * Bug#22943 syscall pruning in libmysqlunknown2007-01-292-12/+1
| | | | | * | Valgrind error fixesunknown2007-02-011-0/+4
| | | | | |/
* | | | | | mergeVladislav Vaintroub2009-11-023-38/+113
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Bug#47571: idle named pipe connection is unkillableVladislav Vaintroub2009-11-023-39/+113
| |/ / /
* | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+4
|\ \ \ \
| * | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+4
| |/ / /
* | | | backport of Vladislav Vaintroub2009-09-301-2/+2
* | | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-2/+0
|/ / /
* | | Merge from 5.0Staale Smedseng2009-07-231-18/+42
|\ \ \ | |/ /
| * | Bug #45770 errors reading server SSL files are printed, butStaale Smedseng2009-07-231-18/+42
* | | Bug#33899: Deadlock in mysql_real_query with shared memory connectionsDavi Arnaut2009-03-261-7/+15
|\ \ \ | |/ /
| * | Bug#33899: Deadlock in mysql_real_query with shared memory connectionsDavi Arnaut2009-03-261-7/+13
| * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-211-0/+1
|\ \ \
| * | | Bug#31929 Windows build fails with >=4 Parallel build threads.unknown2008-01-291-0/+1
* | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-181-2/+2
|\ \ \ \
| * | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>unknown2008-02-181-2/+2
| |/ / /
* | | | Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988unknown2008-02-071-14/+21
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Bug#33050 5.0.50 fails many SSL testcasesunknown2008-02-071-14/+21
* | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintunknown2007-08-281-96/+46
|\ \ \ | |/ /
| * | Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117unknown2007-08-281-96/+46
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-08-161-1/+7
|\ \ \
| * | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:unknown2007-08-061-1/+7
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-131-1/+1
* | | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.unknown2007-07-311-0/+0
|/ / /
* | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50unknown2007-07-121-0/+10
|\ \ \ | |/ /
| * | Bug #29579 Clients using SSL can hang the serverunknown2007-07-121-0/+10
* | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51unknown2007-06-059-97/+100
|\ \ \
| * | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-109-97/+100
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664unknown2007-05-242-15/+28
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Bug#26664 test suite times out on OS X 64bitunknown2007-05-242-15/+28
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-04-111-2/+7
|\ \ \ | |/ /
View Lorry Controller Status