Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -17/+0 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 3 | -3/+4 |
|\ | |||||
| * | 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 |
| | | | |\ | |||||
| * | | | \ | 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 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 11 | -50/+93 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'T | Dmitry Lenev | 2011-07-22 | 2 | -29/+65 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 10 | -20/+25 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 7 | -13/+29 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | 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 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| * | | | | | | 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 |
* | | | | | | | less boilerplate code - move common operations to wrappers | Sergei Golubchik | 2011-07-14 | 1 | -23/+0 |
* | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 2 | -3/+3 |
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 6 | -78/+50 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Manual merge from 5.1 | Mattias Jonsson | 2011-04-20 | 2 | -4/+4 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 2 | -6/+5 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -3/+3 |
| * | | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -2/+0 |
| * | | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 2 | -68/+0 |
| * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-11-16 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 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 |
| * | | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.c | Davi Arnaut | 2010-10-06 | 2 | -0/+17 |
| * | | | | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive() | Jon Olav Hauglid | 2010-10-06 | 1 | -2/+25 |
| * | | | | | Bug #56292 Deadlock with ALTER TABLE and MERGE tables | Jon Olav Hauglid | 2010-09-08 | 1 | -0/+2 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -2/+2 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 8 | -27/+71 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | 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 |
| | |\ \ \ | | | |/ / |