Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -2/+0 |
* | cosmetic fixes | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
* | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1244/+1530 |
|\ | |||||
| * | federated.partition test - fix the bad merge | Sergei Golubchik | 2013-07-12 | 1 | -0/+3 |
| * | Fix trivial compile failures observed in buildbot | Sergey Petrunya | 2013-07-05 | 1 | -2/+2 |
| * | Fixed issues with partitions and create temporary table SELECT ... | Michael Widenius | 2013-07-03 | 1 | -41/+64 |
| * | ha_partition.cc and ha_partition.h are now completely merged | Michael Widenius | 2013-06-27 | 1 | -157/+394 |
| * | Some corrections of the merge for the partition code. | Igor Babaev | 2013-06-25 | 1 | -12/+16 |
| * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -600/+1079 |
| * | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -3/+3 |
* | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -27/+469 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -27/+469 |
| |\ \ | |||||
| | * \ | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -27/+469 |
| | |\ \ | |||||
| | | * | | Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN | Mattias Jonsson | 2013-02-14 | 1 | -1/+2 |
| | | * | | Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING | Mattias Jonsson | 2013-01-30 | 1 | -20/+463 |
| | | |\ \ | |||||
* | | | \ \ | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -23/+37 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | dead code, remove unused argument | Sergei Golubchik | 2013-04-09 | 1 | -2/+1 |
| * | | | | rename a handler method to more precisely reflect what kind of a hack it does | Sergei Golubchik | 2013-04-09 | 1 | -4/+4 |
| * | | | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 1 | -15/+12 |
| * | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -2/+20 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -2/+20 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | merge | Mattias Jonsson | 2012-12-27 | 1 | -0/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug#14845133: | Mattias Jonsson | 2012-11-13 | 1 | -2/+19 |
| | | * | | manual merge of bug#14845133 mysql-5.1 -> mysql-5.5 | Mattias Jonsson | 2012-11-13 | 1 | -2/+19 |
| | | |\ \ | |||||
| | | | * | | Bug#14845133: | Mattias Jonsson | 2012-11-13 | 1 | -2/+19 |
| | | | |/ | |||||
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -48/+174 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -45/+171 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -45/+171 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#14495351: CRASH IN HA_PARTITION::HANDLE_UNORDERED_NEXT | Jon Olav Hauglid | 2012-10-03 | 1 | -1/+1 |
| | | * | | Bug#14495351: CRASH IN HA_PARTITION::HANDLE_UNORDERED_NEXT | Mattias Jonsson | 2012-09-10 | 1 | -46/+172 |
| * | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -3/+3 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 |
* | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | The patch for the task mdev-539. | Igor Babaev | 2012-12-20 | 1 | -1/+2 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -29/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -7/+0 |
| * | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -63/+92 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * \ \ | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -46/+91 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -46/+91 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -45/+90 |
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||||
| | | * | | | | | Merge 5.2 -> 5.3 | unknown | 2012-11-01 | 1 | -2/+2 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge 5.1 -> 5.2 | unknown | 2012-11-01 | 1 | -2/+2 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | Fixed MDEV-612, LP:1010759 - Valgrind error ha_maria::check_if_incompatible_d... | Michael Widenius | 2012-10-31 | 1 | -2/+2 |
| | | * | | | | | 5.2 merge | Sergei Golubchik | 2012-05-20 | 1 | -15/+15 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | 5.1 merge | Sergei Golubchik | 2012-05-18 | 1 | -15/+15 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 1 | -15/+15 |
| | | | | |\ \ \ | |||||
| * | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -20/+2 |
* | | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -61/+90 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -61/+90 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | |