| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -9/+1 |
| * | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+17 |
| * | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
| |\ | |||||
| | * | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
| | |\ | |||||
| | | * | MDEV-4824 userstats - wrong user statistics | Sergei Golubchik | 2013-11-11 | 1 | -1/+1 |
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
| * | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 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 | -1/+1 |
| | |/ | |||||
| * | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -2/+4 |
| * | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+4 |
| |/ | |||||
| * | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | | |\ | |||||
| * | | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| * | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+5 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -2/+2 |
| | * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -3/+3 |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | | | |||||
| | | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -3/+3 |
| | | | |/ / | | |/| | | |||||
| * | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -46/+1 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteam | Jon Olav Hauglid | 2010-11-18 | 1 | -45/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -45/+0 |
| | * | | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well. | Alexander Barkov | 2010-11-18 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -4/+2 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| | * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+7 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+7 |
| | | |\ \ | | | |/ | |||||
| | | | * | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -1/+4 |
| | | | |\ | |||||
| | * | | \ | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | * | \ \ \ | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | * | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -1/+1 |
| | |/ / / / / | |||||
| | * | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -2/+1 |
| | * | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -16/+4 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -541/+22 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -1/+0 |
| * | | | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -13/+5 |
| * | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -3/+3 |
| * | | | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-06-11 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -1/+4 |
| | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | | Backport from next-mr-bugfixing of tor.didriksen@sun.com-20100106140051-3j2iu... | Tor Didriksen | 2010-05-19 | 1 | -2/+3 |
| | |/ / / / / / | |||||
| | * | | | | | | Bug#49501 Inefficient information_schema check (system collation) | Sergey Glukhov | 2010-01-19 | 1 | -1/+1 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | WL#5030: Splitting mysql_priv.h | Mats Kindahl | 2010-04-07 | 1 | -0/+1 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |