Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -1/+1 |
|\ | |||||
| * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fixing wrong copyright. Index.xml was modified in 2005, | Alexander Barkov | 2012-07-24 | 1 | -1/+1 |
* | | | | Fixed that 'make distcheck' works with automake 1.11.11 | Michael Widenius | 2012-02-21 | 1 | -0/+1 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 3 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 3 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED | Raghav Kapoor | 2011-09-28 | 1 | -2/+2 |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 2 | -4/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -4/+4 |
| | | |\ | |||||
* | | | | | test results updated. | Alexey Botchkov | 2011-11-17 | 1 | -3/+2 |
* | | | | | merging. | Alexey Botchkov | 2011-11-12 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 1 | -0/+4 |
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -0/+2 |
| * | | | | | Fix for LP BUG#806071 | unknown | 2011-07-21 | 1 | -0/+2 |
* | | | | | | gis-related tests fixes. | Alexey Botchkov | 2011-06-20 | 1 | -8/+46 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -6/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -2/+2 |
| | * | | | | | post-review changes 1 | Sergei Golubchik | 2011-05-19 | 1 | -4/+4 |
| | * | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -4/+4 |
| * | | | | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e... | Michael Widenius | 2011-05-21 | 1 | -0/+13 |
| * | | | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -0/+4 |
| * | | | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | MWL#89 - Automatic merge with 5.3 | unknown | 2011-05-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | MWL#89 | unknown | 2011-05-02 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| | | * | | | | | | MWL#89 | unknown | 2011-03-30 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | | * | | | | | MWL#89 | unknown | 2011-03-01 | 1 | -0/+2 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge MWL#89 into 5.3 main. | unknown | 2011-01-11 | 1 | -0/+2 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * \ \ \ \ | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-11-05 | 1 | -0/+2 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-09-30 | 1 | -0/+2 |
| * | | | | | | | | | | | Merge with main 5.3 | Michael Widenius | 2011-05-08 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -0/+4 |
| * | | | | | | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -2/+15 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Added ALTER ONLINE TABLE, which will give an error if the change can't be don... | Michael Widenius | 2011-04-28 | 1 | -0/+3 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | | * | | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+16 |
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | |||||
| | | | * | | | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -0/+16 |
| | | * | | | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8 | Alexander Barkov | 2010-11-26 | 1 | -1/+1 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
* | | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 2 | -1/+55 |
|/ / / / / / / | |||||
* | | | | | | | virtual columns: | Sergei Golubchik | 2010-12-31 | 1 | -2/+4 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | 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 |
* | | | | | restore shifted error numbers | Sergei Golubchik | 2010-09-12 | 1 | -8/+7 |
* | | | | | Fixed bug #604549. | Igor Babaev | 2010-07-13 | 1 | -8/+11 |
| |_|_|/ |/| | | | |||||
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+1 |
| |\ \ \ |