Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -14/+14 |
* | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -15/+15 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
* | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -4/+2 |
* | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -7/+0 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+3 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+3 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+3 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -4/+3 |
| | | | |\ | |||||
| * | | | \ | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -6/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -6/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -6/+3 |
| | | |\ \ \ | | | | |/ / | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -38/+31 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -4/+3 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -4/+3 |
| | |/ / / / | |||||
| * | | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -27/+24 |
| * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-10-19 | 1 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -4/+6 |
| * | | | | | merge of mysql-5.5 into mysql-5.5-wl1054 | Georgi Kodinov | 2010-09-20 | 1 | -21/+8 |
| |\ \ \ \ \ | |||||
| * | | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -1/+1 |
* | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -8/+33 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | merge with 5.1 | Sergei Golubchik | 2010-07-25 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -1/+1 |
| * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -12/+18 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -11/+0 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -11/+0 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Bug#51591 deadlock in the plugins+status+variables | Staale Smedseng | 2010-04-19 | 1 | -11/+0 |
| | * | | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
| | * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -7/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Removed compiler warnings | Michael Widenius | 2010-01-06 | 1 | -0/+2 |
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+10 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -0/+3 |
| |/ / / | |||||
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -21/+25 |
| |\ \ \ | |||||
| * \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -2/+8 |
| |\ \ \ \ | |||||
| * | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -5/+10 |
| * | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -18/+7 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -3/+3 |
* | | | | | | | | Commit on behalf of Dmitry Lenev. | Konstantin Osipov | 2010-08-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix for bug #52044 "FLUSH TABLES WITH READ LOCK and FLUSH | Dmitry Lenev | 2010-07-27 | 1 | -2/+2 |
* | | | | | | | | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". | Konstantin Osipov | 2010-08-09 | 1 | -21/+8 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Fix build failure. | Alexander Nozdrin | 2010-07-29 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -1/+2 |