Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge. | Igor Babaev | 2010-12-10 | 1 | -1/+4 |
|\ | |||||
| * | Merge | Igor Babaev | 2010-11-05 | 1 | -1/+4 |
| |\ | |||||
| | * | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 1 | -1/+4 |
| | |\ | |||||
| | | * | The main patch for MWL#128: Implement Block Nested Loop Hash Join. | Igor Babaev | 2010-08-31 | 1 | -1/+4 |
* | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix problems seen in Buildbot: | unknown | 2010-12-02 | 1 | -0/+2 |
| * | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -1/+1 |
* | | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -8/+12 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -1/+1 |
* | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -35/+47 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -4/+4 |
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -18/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -18/+13 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -20/+15 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -4/+25 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -4/+25 |
| | |\ \ | | | |/ | |||||
| | | * | merge | Georgi Kodinov | 2010-06-04 | 1 | -1/+17 |
| | | |\ | |||||
| | | | * | Bug #52315: utc_date() crashes when system time > year 2037 | Georgi Kodinov | 2010-06-04 | 1 | -1/+17 |
| | | * | | Bug#52884 mysql-test-run does not work with --debug option | Sergey Glukhov | 2010-05-20 | 1 | -2/+7 |
| * | | | | --plugin_maturity command-line option | Sergei Golubchik | 2010-06-16 | 1 | -9/+5 |
* | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -22/+46 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+11 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #37168: Missing variable - skip_name_resolve | Georgi Kodinov | 2010-03-31 | 1 | -0/+4 |
| | | * | | Merge fix for BUG51342 to 5.1-bugteam. | Sergey Vojtovich | 2010-03-10 | 1 | -0/+7 |
| | | |\ \ | | | | |/ | |||||
| | | | * | BUG#51342 - more xid crashing | Sergey Vojtovich | 2010-03-10 | 1 | -0/+7 |
| * | | | | rename "partitioned key cache" to "segmented" | Sergei Golubchik | 2010-05-26 | 1 | -1/+1 |
| * | | | | Merge with 5.1 | Michael Widenius | 2010-04-08 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -3/+3 |
| * | | | | fixes for builbot failures | Sergei Golubchik | 2010-04-06 | 1 | -12/+6 |
| * | | | | Merge with the latest changes of 5.2 | Igor Babaev | 2010-04-03 | 1 | -9/+10 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -9/+10 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -9/+10 |
| * | | | | | Merge with the latest changes in the 5.2 tree. | Igor Babaev | 2010-03-29 | 1 | -4/+17 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -10/+28 |
* | | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -8/+32 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -4/+17 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Automerge MySQL 5.1.44 merge into MariaDB trunk. | unknown | 2010-03-09 | 1 | -1/+14 |
| | |\ \ \ | |||||
| | | * \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+14 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -1/+1 |
| | | | * | | BUG#46364 MyISAM transbuffer problems (NTM problem) | Alfranio Correia | 2010-01-20 | 1 | -0/+2 |
| | | | * | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -0/+11 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -0/+12 |
| | | | | * | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 |
| | | | | * | Bug #32223 SETting max_allowed_packet variable | Staale Smedseng | 2009-06-19 | 1 | -4/+19 |