Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cosmetic fixes | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
* | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -221/+143 |
|\ | |||||
| * | merge bugfuxes for sp-error.test | Sergei Golubchik | 2013-07-12 | 1 | -0/+8 |
| * | Fix limit_rows_examined.test: | Sergey Petrunya | 2013-07-05 | 1 | -1/+1 |
| * | Fixed some memory leaks | Michael Widenius | 2013-06-19 | 1 | -1/+8 |
| * | Finished merging wl5986 started by Igor. | unknown | 2013-06-19 | 1 | -194/+70 |
| * | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -1/+2 |
| * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -29/+60 |
| * | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -0/+5 |
|\ \ | |||||
| * \ | Merge. | Sergey Vojtovich | 2013-06-07 | 1 | -0/+5 |
| |\ \ | |||||
| | * | | MDEV-4568 - Port Percona response time distribution as audit plugin | Sergey Vojtovich | 2013-06-04 | 1 | -0/+5 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -3/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -3/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * | | Bug#16056537: MYSQLD CRASHES IN ITEM_FUNC_GET_USER_VAR::FIX_LENGTH_AND_DEC() | Alexander Nozdrin | 2013-02-15 | 1 | -1/+2 |
| | | * | | Merged fix for bug #15954896 "SP, MULTI-TABLE DELETE AND LONG ALIAS" | Dmitry Lenev | 2012-12-05 | 1 | -22/+28 |
| | | |\ \ | |||||
| | | | * | | Bug #15954896 "SP, MULTI-TABLE DELETE AND LONG ALIAS". | Dmitry Lenev | 2012-12-05 | 1 | -22/+28 |
| | * | | | | If one declared several continue handler for the same condition on different ... | Michael Widenius | 2013-05-06 | 1 | -2/+4 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). | Alexey Botchkov | 2013-04-13 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -27/+33 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -22/+28 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * | | | Bug #15954896 "SP, MULTI-TABLE DELETE AND LONG ALIAS". | Dmitry Lenev | 2012-12-10 | 1 | -22/+28 |
| | | |/ / | |||||
| | * | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -22/+28 |
| | |\ \ \ | |||||
| | | * \ \ | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -22/+28 |
| | | |\ \ \ | |||||
| | | | * \ \ | 5.1 merge | Sergei Golubchik | 2013-01-10 | 1 | -22/+28 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -22/+28 |
| | | | | |\ \ \ | |||||
| | | | | | * | | | Last-minute fix to 5.1.67, | Joerg Bruehe | 2012-12-07 | 1 | -22/+28 |
| | | | | | | |/ | | | | | | |/| | |||||
| | | | | | * | | Merge from mysql-5.1.62-release | unknown | 2012-03-20 | 1 | -0/+17 |
| | | | | | |\ \ | |||||
| | | * | | | \ \ | 5.2 merge | Sergei Golubchik | 2012-05-20 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | * | | | | | 5.1 merge | Sergei Golubchik | 2012-05-18 | 1 | -1/+1 |
| | | | |\ \ \ \ \ | | | | | |/ / / / | |||||
| | | | | * | | | | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 1 | -1/+1 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2012-03-08 | 1 | -1/+1 |
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | / / | | | | | | | |/ / | | | | | | |/| | | |||||
| | | * | | | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+17 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | * | | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+17 |
| | | | |\ \ \ \ \ | | | | | |/ / / / | |||||
| | | | | * | | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+17 |
| | | | | |\ \ \ \ | | | | | | |/ / / | |||||
| * | | | | | | | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
| * | | | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -5/+5 |
| * | | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -6/+6 |
* | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | MDEV-259 audit plugin does not see sub-statements | Sergei Golubchik | 2012-11-08 | 1 | -2/+1 |
| * | | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -3/+1 |
| | |/ / / / / / / | |||||
* | | | | | | | | | small code cleanup taken from MySQL 5.6 | Sergei Golubchik | 2012-12-16 | 1 | -3/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5 | Sergey Petrunya | 2012-05-16 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | MWL#182: Explain running statements: merge with 5.3-main (needs fixing) | Sergey Petrunya | 2012-01-03 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | |