summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Temporary commit of 10.0-mergeMichael Widenius2013-03-262-5/+8
* 10.0-base mergeSergei Golubchik2013-01-313-5/+5
|\
| * cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-232-3/+3
| * MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-233-5/+5
* | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-3/+0
|\ \ | |/
| * Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-3/+0
| |\
| | * Fixed some compiler warningsMichael Widenius2012-12-191-3/+0
* | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-189-253/+1
|\ \ \ | |/ /
| * | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-178-252/+0
| * | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-1619-77/+84
| |\ \ | | |/
| | * 5.3->5.5 mergeSergei Golubchik2012-11-221-1/+1
| | |\
| | | * Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-094-41/+5
| | | |\
| | | | * Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-084-41/+5
| | | | |\
| | | | | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-064-41/+5
| | | | | |\
* | | | | | \ merge with 5.5Sergei Golubchik2012-11-0319-76/+83
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 5.3 mergeSergei Golubchik2012-10-181-2/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | mergeSergei Golubchik2012-09-271-2/+6
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge from 5.1unknown2012-09-271-2/+6
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Fix incorrect assembler in Taocrypt which causes crashes on i386 with certain...unknown2012-09-271-2/+6
| | * | | | | 5.2 merge.Sergei Golubchik2012-08-221-0/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 5.1 mergeSergei Golubchik2012-08-221-0/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+4
| | | | |\ \ \
| * | | | \ \ \ mysql-5.5.28Sergei Golubchik2012-10-1618-74/+77
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-1/+1
| | * | | | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-2/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-2/+3
| | * | | | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-071-37/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-072-38/+1
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Bug#13904906: YASSL PRE-AUTH CRASH WITH 5.1.62, 5.5.22Harin Vadodaria2012-07-2416-35/+74
* | | | | | | | disable x86 asm version of taocrypt arc4 code for gcc,Sergei Golubchik2012-10-301-0/+4
* | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-193-4/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Automatic merge with 5.5Michael Widenius2012-09-013-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed compiler warningsMichael Widenius2012-08-171-1/+1
| | * | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | merge 5.1->5.5Georgi Kodinov2012-05-151-0/+4
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Bug #11761822: yassl rejects valid certificate which openssl acceptsGeorgi Kodinov2012-05-151-0/+4
| | * | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-311-3/+1
* | | | | | | | Fixing test casesMichael Widenius2012-08-232-3/+17
* | | | | | | | More fixesMichael Widenius2012-08-171-3/+3
* | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-1413-93/+251
|/ / / / / / /
* | | | | | | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-3/+2
* | | | | | | Merge with 5.5Michael Widenius2012-05-311-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Building RPMs with CPackSergei Golubchik2012-05-221-2/+2
* | | | | | | Added text for errno in error messages by:Michael Widenius2012-05-301-2/+2
|/ / / / / /
* | | | | | Fixed some simple warnings on Windows.Vladislav Vaintroub2012-04-131-3/+3
* | | | | | mergeSergei Golubchik2012-04-071-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mergeSergei Golubchik2012-04-0599-941/+2110
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | mergeSergei Golubchik2012-04-0599-941/+2110
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | mysql-5.1.62 mergeSergei Golubchik2012-04-0599-941/+2110
| | | |\ \ \ | | | | | |/ | | | | |/|
View Lorry Controller Status