Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanup | Sergei Golubchik | 2013-08-12 | 1 | -6/+4 |
* | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -33/+44 |
|\ | |||||
| * | Fixes for innodb suite, merging tests from 5.6. | Sergei Golubchik | 2013-07-15 | 1 | -4/+1 |
| * | strict.test now works. | Michael Widenius | 2013-07-02 | 1 | -2/+2 |
| * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -13/+27 |
| * | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -14/+14 |
* | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -14/+15 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -12/+13 |
| |\ \ | |||||
| | * \ | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * \ | Merge from 5.1 to 5.5 | Nisha Gopalakrishnan | 2013-03-28 | 1 | -1/+3 |
| | | |\ \ | |||||
| | | | * | | BUG#11753852: IF() VALUES ARE EVALUATED DIFFERENTLY IN A | Nisha Gopalakrishnan | 2013-03-28 | 1 | -1/+3 |
| | * | | | | Merging from 5.3 | Alexander Barkov | 2013-07-08 | 1 | -11/+10 |
| | |\ \ \ \ | |||||
| | | * | | | | MDEV-4667 DATE('string') incompability between mysql and mariadb | Sergei Golubchik | 2013-07-03 | 1 | -8/+8 |
* | | | | | | | Merging temporal literals | Alexander Barkov | 2013-07-10 | 1 | -1/+92 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adding support for the SQL-standard temporal literals. | Alexander Barkov | 2013-07-10 | 1 | -1/+92 |
* | | | | | | | | Adding support for MySQL-5.6 temporal column types: | Alexander Barkov | 2013-07-10 | 1 | -11/+8 |
|/ / / / / / / | |||||
* | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -36/+22 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -36/+22 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | The bug | Alexander Barkov | 2013-05-08 | 1 | -33/+19 |
| | * | | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -3/+3 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLY | Gleb Shchepa | 2013-01-31 | 1 | -2/+2 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | * | | | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLY | Gleb Shchepa | 2013-01-23 | 1 | -2/+2 |
| | | * | | | | 5.1 -> 5.5 merge | Sergey Glukhov | 2012-08-09 | 1 | -1/+6 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Bug #14409015 MEMORY LEAK WHEN REFERENCING OUTER FIELD IN HAVING | Sergey Glukhov | 2012-08-09 | 1 | -1/+6 |
| | * | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -1/+1 |
* | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -12/+28 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | MDEV-3917 multiple use locks (GET_LOCK) in one connection. | Alexey Botchkov | 2013-04-12 | 1 | -1/+1 |
| * | | | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -4/+4 |
| * | | | | | Merge 5.5->10.0-base | Igor Babaev | 2013-03-31 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-4243 : remove several clang warnings. | Vladislav Vaintroub | 2013-03-29 | 1 | -2/+2 |
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -3/+7 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 5.3 merge | Sergei Golubchik | 2013-03-27 | 1 | -2/+6 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | MDEV-4281 Assertion `maybe_null && item->null_value' fails in make_sortkey on... | Sergei Golubchik | 2013-03-17 | 1 | -2/+6 |
| | | * | | | backport of: | unknown | 2013-01-17 | 1 | -1/+1 |
| | * | | | | MDEV-4284 Assertion `cmp_items[(uint)cmp_type]' fails in sql/item_cmpfunc.cc | Sergei Golubchik | 2013-03-17 | 1 | -1/+1 |
| * | | | | | [NOT] EXISTS to IN transformation. | unknown | 2013-02-26 | 1 | -2/+14 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -6/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -6/+14 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Don't reset maybe_null in update_used_tables(); This breaks ROLLUP | Michael Widenius | 2013-01-17 | 1 | -1/+1 |
| | * | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -3/+11 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-3873 & MDEV-3876 & MDEV-3912 : Wrong result (extra rows) with ALL subquery | unknown | 2012-12-28 | 1 | -2/+9 |
| | | * | | | MDEV-3928: Assertion `example' failed in Item_cache::is_expensive_processor w... | unknown | 2012-12-19 | 1 | -1/+2 |
| | * | | | | non-functional cleanup, clarifying CONVERT_IF_BIGGER_TO_BLOB | Sergei Golubchik | 2013-01-07 | 1 | -3/+3 |
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -11/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -11/+0 |
| |/ / / / | |||||
* | | | | | small code cleanup taken from MySQL 5.6 | Sergei Golubchik | 2012-12-16 | 1 | -2/+1 |
* | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix of MDEV-589. | unknown | 2012-10-05 | 1 | -2/+2 |
| * | | | | MDEV-3804: | unknown | 2012-10-11 | 1 | -1/+1 |