summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-252-3/+1
* merge.Sergei Golubchik2010-11-2555-22/+18792
|\
| * fixes for windowsSergei Golubchik2010-10-262-1/+4
| * Automatic mergeMichael Widenius2010-10-013-3/+4
| |\
| | * Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-243-3/+4
| * | merge with 5.1Sergei Golubchik2010-09-1111-67/+63
| |\ \ | | |/ | |/|
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-2711-67/+63
| | |\
| * | \ Automerge with 5.1Michael Widenius2010-08-251-2/+2
| |\ \ \ | | |/ /
| | * | Fixed compiler warnings from Windows compilerMichael Widenius2010-08-111-2/+2
| * | | Merge with MariaDB 5.1.49Michael Widenius2010-08-0521-100/+115
| |\ \ \ | | |/ /
| | * | Fixed compiler warningsMichael Widenius2010-08-042-4/+5
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-0221-100/+114
| | |\ \
| * | \ \ Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Implement an NSIS based installerBo Thorsen2010-06-251-0/+2
| * | | | merge 5.1->5.2Sergei Golubchik2010-06-014-4/+7
| |\ \ \ \ | | |/ / /
| | * | | Automerge latest fixes from trunk into 5.1.46 release branch.unknown2010-05-261-1/+1
| | |\ \ \
| | * | | | (Hopefully) better fix for Windows warning on redefined TAILQ_EMPTY;unknown2010-04-281-1/+4
| | * | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-283-3/+3
| | |\ \ \ \
| * | \ \ \ \ mergedSergei Golubchik2010-05-151-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | fix includes in libevent to support vpath buildsSergei Golubchik2010-05-151-1/+1
| | |/ / / /
| * | | | | Automerge mariadb 5.1 -> mariadb 5.2unknown2010-05-052-2/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix a bunch of Windows warningsBo Thorsen2010-04-211-1/+0
| | * | | | Remove unnecessary redefinition of TAILQ_EMPTYbo.thorsen2010-04-091-1/+0
| * | | | | fixes for windows buildsSergei Golubchik2010-04-023-5/+3
| * | | | | Merge with 5.1Michael Widenius2010-04-012-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Removed compiler warningMichael Widenius2010-03-302-2/+2
| * | | | | mergedSergei Golubchik2010-03-151-46/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-46/+42
| | |\ \ \ \
| * | \ \ \ \ merge 5.1->5.2unknown2010-02-016-58/+78
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Changed version number from RC to stableMichael Widenius2010-01-291-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge with fixes for compiler warnings and 2 fixed test casesMichael Widenius2010-01-281-1/+1
| | |\ \ \ \ \ \
| | * | | | | | | YaSSL cert info buffer overflow fixSergei Golubchik2010-01-272-49/+67
| | |/ / / / / /
| | * | | | | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-5/+7
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Revert earlier change that removes warnings, but breaks Windows compilation.unknown2010-01-072-5/+2
| | * | | | | | Removed compiler warningsMichael Widenius2010-01-063-6/+9
| * | | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-065-6/+9
| |/ / / / / /
| * | | | | | Fix some compiler warnings.unknown2009-12-061-1/+2
| * | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-162-2/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 5.1-release branch into MariaDB trunk.unknown2009-11-061-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | libevent fixup required for Debian 4 (Etch)Arjen Lentz2009-10-311-0/+5
| * | | | | | | | Added federatedx storage engineMichael Widenius2009-10-301-0/+2
| * | | | | | | | Fixed compiler warning messageMichael Widenius2009-10-264-1/+11
| |/ / / / / / /
| * | | | | | | Make sure to use the correct location for config.h when generating event-conf...Peter Lieverdink2009-09-301-2/+2
| * | | | | | | Post-merge fixesSergey Petrunya2009-09-154-6/+5
| * | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-156-8/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Fix most Compiler warnings seen in buildbot.unknown2009-09-036-9/+16
| * | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-086-3/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-255-6/+6
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix build error in some configs.unknown2009-03-131-1409/+0
| * | | | | | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-1343-3/+20153
View Lorry Controller Status