Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Merge with local tree | Michael Widenius | 2010-04-08 | 1 | -0/+2 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge with 5.1 | Michael Widenius | 2010-04-08 | 1 | -0/+2 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -0/+2 | |
| | * | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -0/+5 | |
| | |/ / / | ||||||
| | * | | | Merge with the latest changes of 5.2 | Igor Babaev | 2010-04-03 | 1 | -1/+1 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+1 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -1/+1 | |
| | * | | | | Merge with the latest changes in the 5.2 tree. | Igor Babaev | 2010-03-29 | 1 | -10/+8 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | simple speed & space optimization: | Michael Widenius | 2010-03-25 | 1 | -2/+5 | |
| | * | | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -3/+33 | |
| * | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -27/+39 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -8/+3 | |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | ||||||
| | | * | | small code cleanup - "good ifdef is no ifdef" | Sergei Golubchik | 2010-03-08 | 1 | -8/+3 | |
| | * | | | Merge with 5.1 | Michael Widenius | 2010-01-04 | 1 | -10/+0 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge PBXT 1.0.09f RC3 into MariaDB. | unknown | 2009-12-02 | 1 | -10/+0 | |
| | | |\ \ | ||||||
| | | | * | | Removed the assertion that assumes InnoDB is the only engine that supports XA | Paul McCullagh | 2009-11-25 | 1 | -1/+6 | |
| | * | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -9/+36 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -9/+36 | |
| | | |\ \ \ | | | | |/ / | | | |/| | | ||||||
| * | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -130/+0 | |
| * | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -2/+54 | |
| |/ / / / | ||||||
| * | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -13/+135 | |
| |/ / / | ||||||
| * | | | MySQL 5.1 -> MariaDB 5.1 merge | Sergey Petrunya | 2009-09-10 | 1 | -1/+1 | |
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -22/+64 | |
| |\ \ \ | ||||||
| * | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -2/+2 | |
| * | | | | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35. | unknown | 2009-05-22 | 1 | -3/+0 | |
| * | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -14/+25 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -15/+22 | |
| | |\ \ \ \ | ||||||
| * | | | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -2/+6 | |
| * | | | | | | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -0/+4 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -1/+5 | |
| | |\ \ \ \ \ | ||||||
| * | \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -2/+2 | |
| | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -13/+15 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -17/+119 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -105/+55 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix for Bug #37007 Maria: different checksum for MyISAM table depending on CH... | Michael Widenius | 2008-06-28 | 1 | -1/+1 | |
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -4/+7 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -4/+7 | |
| | * | | | | | | | | | | After merge fixes. | unknown | 2008-04-29 | 1 | -1/+1 | |
| | * | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -180/+660 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it | unknown | 2008-02-11 | 1 | -5/+4 | |
| | * | | | | | | | | | | Merge mysql.com:/home/kent/bk/maria/mysql-5.1-release | unknown | 2008-02-08 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-02-06 | 1 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Fixes for running maria-recovery*.test and maria-purge.test under | unknown | 2008-02-06 | 1 | -5/+5 | |
| | * | | | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -5/+332 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | - fix for bug when creating bitmaps | unknown | 2008-01-19 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -8/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge jani@marvel:/my/bk/mysql-maria.new | unknown | 2007-12-18 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recovery | unknown | 2007-12-17 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -7/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / |