summaryrefslogtreecommitdiff
path: root/sql/log.cc
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-82/+206
|\
| * merge with 5.1Sergei Golubchik2010-10-251-48/+70
| |\
| | * 5.1.51 mergeSergei Golubchik2010-10-191-48/+70
| | |\
| * | \ merge with 5.1Sergei Golubchik2010-09-111-45/+61
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-45/+61
| | |\ \
| * | \ \ Automerge with 5.1Michael Widenius2010-08-251-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Added verbose mode to recoveryMichael Widenius2010-08-181-1/+2
| * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-67/+86
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-67/+86
| | |\ \ \
| * | | | | Fix for LP#588251: doStartTableScan() result not checked.Michael Widenius2010-07-171-2/+2
| * | | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-54/+77
| |\ \ \ \ \ | | |/ / / /
| | * | | | bug lp:578117 - Wrong usage of mutex LOCK_sync and LOCK_active in XASergei Golubchik2010-07-011-54/+77
| * | | | | merge 5.1->5.2Sergei Golubchik2010-06-011-14/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-14/+20
| | |\ \ \ \
| * | \ \ \ \ Merge with 5.1Michael Widenius2010-04-081-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Removed compiler warningsMichael Widenius2010-04-071-0/+1
| * | | | | | Maria WL#61unknown2010-04-011-0/+17
| * | | | | | Merge with 5.1Michael Widenius2010-04-011-2/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | two crashes in the TC_LOG_MMAP:Sergei Golubchik2010-03-241-2/+10
| * | | | | | mergedSergei Golubchik2010-03-151-133/+366
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-132/+366
| | |\ \ \ \ \
| * | \ \ \ \ \ merge 5.1->5.2unknown2010-02-011-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-2/+1
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge bug fixes from 5.1Michael Widenius2010-01-041-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed bug in tc.log recovery code that caused crash_commit_before to sometime...Michael Widenius2010-01-041-1/+1
| * | | | | | | | merge 5.1-> 5.2unknown2009-12-081-35/+36
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-36/+37
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-2/+23
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-2/+23
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+23
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ Automatic merge with 5.1Michael Widenius2009-10-281-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Fixed compiler warning messageMichael Widenius2009-10-261-1/+2
| | |/ / / / / / / / /
| * | | | | | | | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-15/+53
| |/ / / / / / / / /
| * | | | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-5/+36
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-5/+36
| * | | | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-55/+193
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-0/+7
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+7
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge with mysql-maria treeMichael Widenius2009-02-191-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-153/+157
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-162/+159
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-9/+9
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge with base MySQL-5.1-mariaMichael Widenius2008-12-031-8/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-8/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...Michael Widenius2008-12-031-1/+6
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-52/+139
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Manual merge and some fixes.unknown2008-05-141-9/+16
| * | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-134/+346
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-2/+4
| * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-02-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status