Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -10/+50 |
|\ | |||||
| * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -11/+51 |
| |\ | |||||
| | * | Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET | Georgi Kodinov | 2011-03-25 | 1 | -2/+36 |
| | * | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -0/+6 |
| | * | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -1/+1 |
| | * | Bug#48053 String::c_ptr has a race and/or does an invalid | Magne Mahre | 2011-02-17 | 1 | -2/+2 |
| | * | merge to 5.1. | Georgi Kodinov | 2011-02-02 | 1 | -6/+6 |
| | |\ | |||||
| | | * | Fixes for Bug #55755 and Bug #52315 part 2 | Georgi Kodinov | 2011-02-02 | 1 | -6/+6 |
* | | | | lp:702084 - myisam_block_size is not reported in SHOW GLOBAL VARIABLES | Sergei Golubchik | 2011-03-28 | 1 | -0/+4 |
* | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 1 | -0/+2 |
* | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -58/+43 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -58/+43 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| | * | | Assorted post-merge fixes, clean-up, integration, compat with 5.6. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -41/+2 |
| | * | | merge | Tatiana A. Nurnberg | 2010-11-24 | 1 | -17/+40 |
| | |\ \ | |||||
| | | * | | Bug#43233: Some server variables are clipped during "update," not "check" stage | Tatiana A. Nurnberg | 2010-11-11 | 1 | -17/+40 |
* | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -8/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -8/+12 |
* | | | | | | 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 |
| | |/ / | |||||
* | | | | 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 |
* | | | | 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 |
* | | | | 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 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -4/+17 |
| |\ \ \ \ | | |/ / / |