| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 5.2 merge | Sergei Golubchik | 2013-12-02 | 1 | -19/+24 |
| |\ | |||||
| | * | 5.1 merge | Sergei Golubchik | 2013-12-01 | 1 | -19/+24 |
| | |\ | |||||
| | | * | MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is br... | Sergei Golubchik | 2013-11-29 | 1 | -19/+24 |
| * | | | MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg | Sergey Petrunya | 2013-03-21 | 1 | -0/+14 |
| * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 7 | -13/+28 |
| |\ \ \ | |/ / | |||||
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 7 | -13/+28 |
| | |\ \ | | |/ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 7 | -13/+28 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 2 | -9/+7 |
| | | | |\ | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 7 | -13/+29 |
| * | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -1/+0 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -1/+0 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 2 | -6/+5 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 2 | -6/+5 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 2 | -6/+5 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 2 | -6/+5 |
| | | | |/ | |||||
| | | | * | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -1/+1 |
| | | | * | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -1/+1 |
| * | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fixed typos | Michael Widenius | 2011-01-07 | 1 | -2/+2 |
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| * | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 2 | -8/+14 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+0 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -3/+0 |
| | * | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 2 | -5/+14 |
| | |\ \ \ | | |/ / | |||||
| | | * | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 2 | -5/+14 |
| * | | | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 3 | -14/+11 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 3 | -14/+11 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 3 | -14/+11 |
| * | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 2 | -10/+5 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -7/+2 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -7/+2 |
| | | |\ \ | | | |/ | |||||
| | | | * | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -5/+0 |
| | | | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -3/+4 |
| | * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+3 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+3 |
| | | |\ \ | | | |/ | |||||
| | | | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -3/+3 |
| * | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti... | Michael Widenius | 2010-07-16 | 4 | -8/+8 |
| |/ / / | |||||
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 2 | -60/+89 |
| |\ \ \ | |/ / | |||||
| | * | | After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and... | unknown | 2010-04-28 | 1 | -2/+3 |
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 2 | -60/+88 |
| | |\ \ | | |/ | |||||
| | | * | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -9/+9 |
| | | * | BUG#48265 - MRG_MYISAM problem (works in 5.0.85, does't | Sergey Vojtovich | 2010-03-03 | 2 | -53/+81 |
| * | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
| |/ / | |||||
| * | | Removed compiler warning | Michael Widenius | 2010-03-30 | 2 | -1/+2 |
| * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Fix for valgrind warning: check whether pointer was initialized. | Davi Arnaut | 2010-02-02 | 1 | -1/+1 |
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+1 |
| |\ \ | |/ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |