Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -4/+5 |
|\ | |||||
| * | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -4/+5 |
* | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -6/+140 |
|\ \ | |/ | |||||
| * | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -3/+18 |
| |\ | |||||
| | * | Merge 5.5 -> mwl248 | Igor Babaev | 2013-01-08 | 1 | -3/+18 |
| | |\ | |||||
| | | * | Fixed the CREATE TABLE IF EXIST generates warnings instead of errors | Michael Widenius | 2012-12-17 | 1 | -1/+5 |
| | | * | Remember original table row pack type for ALTER TABLE if table is not copied. | Michael Widenius | 2012-12-16 | 1 | -2/+13 |
| * | | | Merge mdev539->10.0-base. | Igor Babaev | 2012-12-20 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | The patch for the task mdev-539. | Igor Babaev | 2012-12-20 | 1 | -1/+2 |
| * | | | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+120 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -0/+1 |
| | * | | Addressed the following issue from the review of the patch for | Igor Babaev | 2012-12-08 | 1 | -5/+60 |
| | * | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | * | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -1/+63 |
| | |\ \ | |||||
| | | * \ | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 1 | -26/+34 |
| | | |\ \ | |||||
| | | * \ \ | Merge 5.5->5.5-mwl248 | Igor Babaev | 2012-08-14 | 1 | -15/+114 |
| | | |\ \ \ | |||||
| | | * | | | | Added procedures to delete records by keys from statistical tables. | Igor Babaev | 2012-07-10 | 1 | -1/+63 |
* | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -29/+60 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Merge MariaDB 5.2->5.3 | unknown | 2012-11-20 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixed bug mdev-3845. | Igor Babaev | 2012-11-09 | 1 | -1/+1 |
| * | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -28/+59 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -28/+61 |
| |/ / / / / / / | |||||
* | | | | | | | | small code cleanup taken from MySQL 5.6 | Sergei Golubchik | 2012-12-16 | 1 | -9/+4 |
* | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -38/+149 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Automatic merge | Michael Widenius | 2012-09-22 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o... | Michael Widenius | 2012-09-18 | 1 | -1/+1 |
| | * | | | | | | Added THD::utime_after_query to avoid calling current_utime() twice for every... | Michael Widenius | 2012-09-13 | 1 | -0/+2 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge MDEV-415 -> 10.0-base. | Igor Babaev | 2012-09-01 | 1 | -2/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. | Igor Babaev | 2012-09-01 | 1 | -2/+4 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -10/+11 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | merge from 5.2 | unknown | 2012-08-24 | 1 | -10/+11 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge from 5.1. | unknown | 2012-08-24 | 1 | -10/+11 |
| | | |\ \ \ | |||||
| | | | * | | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -10/+11 |
| * | | | | | | Fixed MDEV-366: Assertion `share->reopen == 1' failed in maria_extra on DROP ... | Michael Widenius | 2012-08-15 | 1 | -1/+1 |
| * | | | | | | Fixed MDEV-365 "Got assertion when doing alter table on a partition" | Michael Widenius | 2012-08-15 | 1 | -2/+2 |
| * | | | | | | automatic merge | Michael Widenius | 2012-08-15 | 1 | -4/+5 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Automatic merge | Michael Widenius | 2012-08-13 | 1 | -4/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fixed compiler warnings (A few of these was bugs) | Michael Widenius | 2012-08-13 | 1 | -4/+5 |
| * | | | | | | | | MDEV-364 Server crashes in add_identifier on concurrent ALTER TABLE and SHOW ... | Sergei Golubchik | 2012-08-13 | 1 | -7/+13 |
| |/ / / / / / / | |||||
| * | | | | | | | compiler warnings | Sergei Golubchik | 2012-08-10 | 1 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -15/+62 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Bug#12623923 Server can crash after failure to create | Jon Olav Hauglid | 2012-07-10 | 1 | -8/+41 |
| | * | | | | | Bug#13982017: ALTER TABLE RENAME ENDS UP WITH ERROR 1050 (42S01) | Jon Olav Hauglid | 2012-06-01 | 1 | -7/+21 |
| * | | | | | | MDEV-340 Save replication comments for DROP TABLE. | Alexey Botchkov | 2012-07-31 | 1 | -0/+52 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -13/+31 |
|/ / / / / | |||||
* | | | | | merge | Sergei Golubchik | 2012-06-16 | 1 | -10/+43 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -10/+43 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug #12902967 CREATING SELF REFERENCING FK ON SAME INDEX | Annamalai Gurusami | 2012-04-17 | 1 | -10/+43 |