summaryrefslogtreecommitdiff
path: root/vio
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+1
|\
| * MDEV-3901: Wrong SSL error messagesVladislav Vaintroub2012-12-011-1/+1
* | MDEV-3822 :10.0-serg fails on windows buildslavesVladislav Vaintroub2012-11-041-49/+26
* | merge with 5.5Sergei Golubchik2012-11-031-37/+55
|\ \ | |/
| * mysql-5.5.28Sergei Golubchik2012-10-161-37/+55
| |\
| | * Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-37/+55
| | |\
| | | * Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-37/+55
* | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-5/+6
|\ \ \ \ | |/ / /
| * | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-6/+7
| |\ \ \ | | |/ /
| | * | merge 5.1->5.5Georgi Kodinov2012-05-151-5/+7
| | |\ \ | | | |/
| | | * Bug #11761822: yassl rejects valid certificate which openssl acceptsGeorgi Kodinov2012-05-151-4/+6
* | | | MDEV-3802: Millisecond timeout support in non-blocking client library + fix i...unknown2012-10-121-0/+30
* | | | fixes for test failuresSergei Golubchik2012-09-271-2/+8
* | | | Compile 10.0 on WindowsVladislav Vaintroub2012-08-301-3/+3
* | | | More fixesMichael Widenius2012-08-173-0/+19
* | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-148-708/+1341
|/ / /
* | | mysql-5.5 mergeSergei Golubchik2012-06-141-1/+1
|\ \ \ | |/ /
| * | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-2/+38
| |\ \
* | \ \ cSergei Golubchik2012-05-211-1/+37
|\ \ \ \ | | |/ / | |/| |
| * | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ...Tatjana Azundris Nuernberg2012-02-191-1/+37
| |\ \ \ | | |/ / | |/| / | | |/
| | * BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ...Tatjana Azundris Nuernberg2012-02-171-1/+39
* | | Update copyright noticesVladislav Vaintroub2012-02-283-0/+3
* | | merge 5.5Vladislav Vaintroub2012-02-272-7/+53
|\ \ \
| * \ \ Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-212-7/+53
| |\ \ \
| | * | | MWL#192: non-blocking client API, after-review fixes.unknown2012-01-062-11/+2
| | * | | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-202-7/+67
* | | | | further reduce diffs to 5.5, monty reviewVladislav Vaintroub2012-01-243-6/+8
* | | | | mergeVladislav Vaintroub2012-01-242-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo)Sergei Golubchik2012-01-171-2/+0
| * | | | 5.3 mergeSergei Golubchik2012-01-132-2/+5
| |\ \ \ \
| | * \ \ \ Merge with 5.1Michael Widenius2011-11-302-6/+12
| | |\ \ \ \
| | | * | | | Fixed compiler warningsMichael Widenius2011-11-302-6/+12
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-246-20/+61
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-216-20/+61
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Updated/added copyright headersKent Boortz2011-07-031-14/+14
| | | | |\ \
* | | | | \ \ mergeVladislav Vaintroub2011-12-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix LPBUG# : allow chain certificate files to work.Vladislav Vaintroub2011-12-271-1/+1
* | | | | | | Initial threadpool implementation for MariaDB 5.5Vladislav Vaintroub2011-12-083-6/+106
|/ / / / / /
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0311-17/+49
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Updated/added copyright headersKent Boortz2011-06-3010-16/+47
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-306-8/+49
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-302-4/+8
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-1/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix bugs found by application verifier : Vladislav Vaintroub2011-05-141-1/+6
| | |_|_|/ / | |/| | | |
| * | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-2/+0
| * | | | | MWL#74: Shared libmysqld.so library.unknown2010-11-171-1/+7
* | | | | | post-merge fixes.Sergei Golubchik2011-07-021-2/+0
* | | | | | 5.5-mergeSergei Golubchik2011-07-028-68/+86
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | build fixes for -Werror (11745920)Tatjana Azundris Nuernberg2011-05-271-2/+4