Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 2 | -184/+261 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 2 | -2/+2 |
|\ | |||||
| * | fix the failing federated.federated_innodb test: | Sergei Golubchik | 2013-01-23 | 2 | -2/+2 |
* | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -1/+0 |
| * | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -3/+3 |
| |\ | |||||
| * | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -2/+0 |
* | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -3/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED | Marc Alff | 2012-08-24 | 1 | -3/+3 |
* | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 2 | -16/+38 |
|\ \ \ | |/ / | |||||
| * | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 2 | -16/+38 |
| |\ \ | | |/ | |||||
| | * | Bug 14116252 - CANNOT BUILD ARCHIVE ENGINE WHEN WITH_PERFSCHEMA_STORAGE_ENGINE=0 | Marc Alff | 2012-05-31 | 2 | -0/+4 |
| | * | Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED | Mayank Prasad | 2012-05-24 | 2 | -16/+34 |
* | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -5/+0 |
|/ / | |||||
* | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -1/+3 |
|\ \ | |||||
| * \ | Automatic merge | Michael Widenius | 2012-03-28 | 1 | -1/+3 |
| |\ \ | |||||
| | * \ | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * | | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -1/+3 |
* | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+8 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| * | | | | | BUG#11748748: Merge from mysql-5.1 to mysql-5.5 | Ashish Agarwal | 2012-02-03 | 1 | -0/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | BUG#11748748 - 37280: CHECK AND REPAIR TABLE REPORT TABLE | Ashish Agarwal | 2012-02-03 | 1 | -0/+6 |
* | | | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -3/+9 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -3/+9 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -11/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -9/+28 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -9/+28 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -9/+28 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
* | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -9/+39 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | BUG#11751793 - 42784: Merge from mysql-5.1 to mysql-5.5 | Ashish Agarwal | 2011-11-23 | 1 | -9/+27 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | BUG#11751793 - 42784: ARCHIVE TABLES CAUSE 100% CPU USAGE | Ashish Agarwal | 2011-11-23 | 1 | -9/+39 |
| * | | | | | bug#11758979 - 51252: ARCHIVE TABLES STILL FAIL UNDER STRESS | Ashish Agarwal | 2011-10-21 | 1 | -0/+12 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 2 | -2/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 5 | -15/+45 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 5 | -15/+45 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 5 | -16/+45 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 2 | -14/+25 |
| | | | |\ \ | |||||
| * | | | | | | remove unnecessary define | Sergei Golubchik | 2011-10-10 | 1 | -1/+0 |
| * | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -0/+1 |
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 3 | -6/+23 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -3/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -3/+18 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -4/+22 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 2 | -17/+27 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -3/+3 |