Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -21/+21 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -24/+65 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -8/+42 |
| |\ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-01-28 | 1 | -1/+1 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-01-28 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | compilation error with -Wuninitialized -Werror | Sergei Golubchik | 2013-01-28 | 1 | -1/+1 |
| | * | | | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -0/+29 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge 5.2->5.3 | Igor Babaev | 2013-01-21 | 1 | -0/+29 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Corrected the fix for bug mdev-3938. | Igor Babaev | 2013-01-16 | 1 | -2/+2 |
| | | | * | Fixed bug mdev-3938. | Igor Babaev | 2013-01-15 | 1 | -0/+29 |
| | | * | | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -3/+2 |
| | | |\ \ | | | | |/ | |||||
| | | | * | 5.1 merge | Sergei Golubchik | 2013-01-10 | 1 | -3/+2 |
| | | | |\ | |||||
| | | | | * | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -3/+2 |
| | | | | |\ | |||||
| | | | | | * | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER | Rohit Kalhans | 2012-09-22 | 1 | -10/+9 |
| | | * | | | | merge from 5.2 | unknown | 2012-08-24 | 1 | -7/+7 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge from 5.1. | unknown | 2012-08-24 | 1 | -7/+7 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -7/+7 |
| | | | * | | | Fix check of view updatability in case of underlying view changes its updatab... | unknown | 2012-02-03 | 1 | -4/+13 |
| | * | | | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 1 | -6/+3 |
| | * | | | | | Fixed some race conditons and bugs related to killed queries | Michael Widenius | 2013-01-11 | 1 | -1/+4 |
| | * | | | | | Fix for MDEV-4009: main.delayed sporadically fails with "query 'REPLACE DELAY... | Michael Widenius | 2013-01-10 | 1 | -0/+4 |
| * | | | | | | fix the failing federated.federated_innodb test: | Sergei Golubchik | 2013-01-23 | 1 | -0/+1 |
| * | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -16/+22 |
* | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -92/+68 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -13/+0 |
| * | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fixed bug mdev-3888. | Igor Babaev | 2012-12-04 | 1 | -1/+2 |
| * | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -1/+3 |
| * | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -78/+64 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -78/+64 |
| | |/ / / / / | |||||
* | | | | | | | small code cleanup taken from MySQL 5.6 | Sergei Golubchik | 2012-12-16 | 1 | -17/+5 |
* | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -12/+58 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -4/+4 |
| |/ / / / / | |||||
| * | | | | | This fix+comments was originally made by Alexey Kopytov | Michael Widenius | 2012-09-18 | 1 | -4/+49 |
| * | | | | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o... | Michael Widenius | 2012-09-18 | 1 | -0/+5 |
| * | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmake | Sergei Golubchik | 2012-07-31 | 1 | -4/+0 |
* | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -20/+18 |
* | | | | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+7 |
|/ / / / / | |||||
* | | | | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. | unknown | 2012-03-12 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Implementation of MDEV-28 LIMIT ROWS EXAMINED | unknown | 2012-03-11 | 1 | -0/+2 |
| |/ / / / | |||||
* | | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -5/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. | unknown | 2012-02-03 | 1 | -5/+14 |
* | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#11748731:SOME 'BIG' TESTS FAILING ON 6.0 | Sneha Modi | 2011-11-21 | 1 | -4/+4 |
| * | | | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-11-10 | 1 | -0/+5 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -16/+18 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -17/+12 |
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -6/+14 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -6/+12 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+5 |
| | | |\ \ \ | | | | | |/ | | | | |/| |