Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'" | Michael Widenius | 2012-02-28 | 4 | -5/+14 |
* | Automatic merge | Michael Widenius | 2012-02-24 | 1 | -3/+9 |
|\ | |||||
| * | Fix for lp:909635: MariaDB crashes on a select with long varchar and blob fields | Michael Widenius | 2012-02-24 | 1 | -3/+9 |
* | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 11 | -19/+66 |
|\ \ | |/ | |||||
| * | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 11 | -19/+66 |
| |\ | |||||
| | * | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-12-15 | 5 | -3/+18 |
| | |\ | |||||
| | | * | Bug #13117023: Innodb increments handler_read_key when it should not | Annamalai Gurusami | 2011-12-13 | 3 | -2/+6 |
| | | * | Bug#13418887 ERROR IN DIAGNOSTIC FUNCTION PAGE_REC_PRINT() | Marko Mäkelä | 2011-12-12 | 3 | -1/+12 |
| | * | | merge | Mattias Jonsson | 2011-12-14 | 1 | -0/+3 |
| | * | | merge 5.1->5.1-security. | Georgi Kodinov | 2011-12-12 | 12 | -78/+137 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGV | Nirbhay Choubey | 2011-11-29 | 2 | -4/+10 |
| | | * | BUG#11751793 - 42784: ARCHIVE TABLES CAUSE 100% CPU USAGE | Ashish Agarwal | 2011-11-23 | 1 | -9/+39 |
| | * | | auto-merge mysql-5.1->mysql-5.5 | Georgi Kodinov | 2011-11-04 | 2 | -1/+7 |
| | |\ \ | |||||
* | | | | | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check... | Michael Widenius | 2012-02-20 | 1 | -2/+5 |
* | | | | | on windows: don't link all plugins with mysqld, only do it for storage engines. | Sergei Golubchik | 2011-12-29 | 1 | -1/+3 |
* | | | | | LPBUG#906638 : Fixes to build oqgraph with boost 1.48 | Vladislav Vaintroub | 2011-12-22 | 1 | -7/+7 |
* | | | | | compilation warning - unused variable | Sergei Golubchik | 2011-12-22 | 1 | -1/+1 |
* | | | | | Merge with 5.1 | Michael Widenius | 2011-12-13 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix GCC build failure in PBXT in some cases/platforms. | unknown | 2011-12-12 | 1 | -4/+4 |
* | | | | | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE | Michael Widenius | 2011-12-13 | 4 | -5/+21 |
* | | | | | update tests | Sergei Golubchik | 2011-12-03 | 1 | -96/+96 |
* | | | | | Fixed buildbot warnings | Michael Widenius | 2011-12-03 | 1 | -2/+1 |
* | | | | | Fixed some Aria limits to be more sane | Michael Widenius | 2011-12-02 | 1 | -3/+3 |
* | | | | | Fixed bug where automaticly zerofilled table was not part of recovery if cras... | Michael Widenius | 2011-12-02 | 4 | -1/+11 |
* | | | | | Fixed compiler warning | Michael Widenius | 2011-12-01 | 1 | -0/+2 |
* | | | | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 10 | -23/+30 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed compiler warning and errors | Michael Widenius | 2011-11-30 | 1 | -2/+2 |
| * | | | | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| * | | | | test both federated and federatedX in the federated suite. | Sergei Golubchik | 2011-11-30 | 1 | -1/+1 |
| * | | | | Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE V... | unknown | 2011-11-30 | 3 | -11/+20 |
| * | | | | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 7 | -8/+7 |
* | | | | | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 5 | -19/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed that maria-recover works as expected. | Michael Widenius | 2011-11-29 | 3 | -12/+9 |
| * | | | | Fix Windows build, and a conversion truncation warning. | Vladislav Vaintroub | 2011-11-29 | 4 | -9/+8 |
| * | | | | Fixed that one can use --maria-recover=backup,force | Michael Widenius | 2011-11-24 | 2 | -3/+3 |
* | | | | | merge, fix Windows warnings | Vladislav Vaintroub | 2011-11-29 | 4 | -4/+4 |
* | | | | | after merge fixes | Sergei Golubchik | 2011-11-28 | 2 | -6/+6 |
* | | | | | Automatic merge | Michael Widenius | 2011-11-24 | 325 | -6335/+7537 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 341 | -6406/+7607 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixes for build failuers found by buildbot | Michael Widenius | 2011-11-24 | 1 | -0/+2 |
| | * | | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 92 | -2480/+1009 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug#13390506 - VALGRIND FAILURE AFTER THE FIX FOR 13371000 | Inaam Rana | 2011-11-18 | 1 | -0/+18 |
| | | * | | | Merge from mysql-5.1.60-release | Karen Langford | 2011-11-17 | 41 | -1446/+512 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Revert revno:3452.71.32 (Bug#12612184 fix). | Marko Mäkelä | 2011-10-26 | 25 | -597/+192 |
| | | | * | | Revert most of revno 3560.9.1 (Bug#12704861) | Marko Mäkelä | 2011-10-26 | 27 | -972/+415 |
| | | | * | | Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTOR | Marko Mäkelä | 2011-10-25 | 5 | -22/+36 |
| | | * | | | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY | Marko Mäkelä | 2011-11-10 | 5 | -25/+28 |
| | | * | | | Bug#13358468 ASSERTION FAILURE IN BTR_PCUR_GET_BLOCK | Marko Mäkelä | 2011-11-08 | 4 | -41/+8 |
| | | * | | | Add debug assertions to catch Bug#13345378 earlier. | Marko Mäkelä | 2011-11-07 | 2 | -0/+16 |
| | | | |/ | | | |/| | |||||
| | | * | | Bug #12884631 62146: TABLES ARE LOST FOR DDL | Marko Mäkelä | 2011-10-27 | 2 | -1/+7 |
| | | |/ |