| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge from 5.3 | unknown | 2012-08-24 | 1 | -29/+12 |
| |\ | |||||
| | * | merge from 5.2 | unknown | 2012-08-24 | 1 | -29/+12 |
| | |\ | |||||
| | | * | Merge from 5.1. | unknown | 2012-08-24 | 1 | -29/+12 |
| | | |\ | |||||
| | | | * | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -29/+12 |
| * | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+7 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+7 |
| | | |\ \ | | | |/ | |||||
| | | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+7 |
| | | | |\ | |||||
| | | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+4 |
| | | | | |\ | |||||
| | | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | | |\ \ | |||||
| | | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Fixed that when using a trigger mysql.proc is now accessed | Michael Widenius | 2011-10-06 | 1 | -0/+1 |
| | | |/ / / / | |||||
| * | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 |
| * | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Manual merge of patch for bug#11756013 from mysql-5.1 tree. | Dmitry Shulga | 2011-06-24 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ | |/ / / / / / / | | | | | | | _ | |||||
| | | * | | | | | Fixed Bug#11756013 (formerly known as bug#47870): | Dmitry Shulga | 2011-06-23 | 1 | -0/+3 |
| | | | |_|/ / | | |/| | | | |||||
| * | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -1/+1 |
| | * | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -8/+23 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -8/+23 |
| | | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -0/+1 |
| | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -0/+6 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -145/+143 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | Merge from mysql-5.5.10-release | unknown | 2011-03-16 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -3/+3 |
| | * | | | | | | Bug #11765416 (former 58381) | Jon Olav Hauglid | 2011-03-15 | 1 | -8/+15 |
| | |/ / / / / | |||||
| | * | | | | | Manual merge from mysql-5.1-bugteam for bug#54486. | Dmitry Shulga | 2010-12-10 | 1 | -11/+11 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | | Fixed bug#54486 - assert in my_seek, concurrent | Dmitry Shulga | 2010-12-10 | 1 | -8/+23 |
| | | | |/ / | | |/| | | |||||
| | | * | | | Bug #46941 crash with lower_case_table_names=2 and foreign key | Magne Mahre | 2010-10-19 | 1 | -0/+6 |
| | * | | | | Bug #57663 Concurrent statement using stored function and DROP DATABASE | Jon Olav Hauglid | 2010-11-17 | 1 | -131/+128 |
| | * | | | | Bug #57663 Concurrent statement using stored function and DROP DATABASE | Jon Olav Hauglid | 2010-11-16 | 1 | -1/+35 |
| | * | | | | Bug #57663 Concurrent statement using stored function and DROP DATABASE | Jon Olav Hauglid | 2010-11-15 | 1 | -46/+6 |
| | * | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW over | Konstantin Osipov | 2010-11-12 | 1 | -1/+0 |
| | * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -1/+2 |
| * | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -13/+6 |
| |\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -0/+36 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER | Jon Olav Hauglid | 2010-06-26 | 1 | -0/+36 |
| | * | | | Fixes for Opensolaris (to get buildbot green) | Michael Widenius | 2010-06-23 | 1 | -6/+3 |
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -18/+33 |
| | |\ \ \ | | |/ / | |||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -10/+14 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -4/+3 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -15/+19 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+0 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -7/+3 |
| * | | | | | | | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-07-13 | 1 | -8/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -10/+9 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |