Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Automatic merge | Michael Widenius | 2012-03-28 | 3 | -4/+32 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge with 5.1 | Michael Widenius | 2012-03-28 | 3 | -4/+31 | |
| | |\ \ | | | |/ | ||||||
| | | * | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 3 | -4/+31 | |
* | | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -1/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Speedups: | Michael Widenius | 2012-03-23 | 1 | -1/+2 | |
* | | | | Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed i... | Michael Widenius | 2012-03-20 | 4 | -6/+28 | |
* | | | | Cleanups: | Michael Widenius | 2012-03-20 | 4 | -4/+28 | |
* | | | | monty's cleanup of my_thr_init.c | Sergei Golubchik | 2012-03-13 | 1 | -2/+1 | |
* | | | | 5.3 merge | Sergei Golubchik | 2012-03-06 | 2 | -1/+9 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Automatic merge | Michael Widenius | 2012-03-05 | 4 | -4/+18 | |
| |\ \ \ | ||||||
| | * | | | Ensure that we mark all processed tables as 'properly closed'. | Michael Widenius | 2012-03-05 | 1 | -0/+8 | |
| | * | | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke... | Michael Widenius | 2012-02-28 | 3 | -4/+10 | |
* | | | | | Merge 5.3->5.5. | Igor Babaev | 2012-03-01 | 6 | -8/+23 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | merge | Sergei Golubchik | 2012-02-28 | 5 | -5/+14 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'" | Michael Widenius | 2012-02-28 | 4 | -5/+14 | |
| * | | | | Merge 5.2->5.3 | Sergey Petrunya | 2012-02-24 | 1 | -3/+9 | |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | ||||||
| | * | | 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 | |
* | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 2 | -20/+8 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -2/+5 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check... | Michael Widenius | 2012-02-20 | 1 | -2/+5 | |
| | * | | compilation warning - unused variable | Sergei Golubchik | 2011-12-22 | 1 | -1/+1 | |
| * | | | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 1 | -24/+3 | |
| * | | | Counters for Index Condition Pushdown added (MDEV-130). | unknown | 2012-02-16 | 1 | -1/+7 | |
* | | | | fix the include guards and add missing gplv2 headers | Sergei Golubchik | 2012-02-17 | 2 | -0/+32 | |
* | | | | Fixed tests consumed big amount of disk space to be "BIG". | unknown | 2012-01-27 | 3 | -4/+18 | |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 15 | -137/+165 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Fix unused variable 'thd' error. | Sergey Petrunya | 2011-12-15 | 1 | -1/+1 | |
| * | | | Merge with 5.2 | Michael Widenius | 2011-12-14 | 4 | -5/+21 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE | Michael Widenius | 2011-12-13 | 4 | -5/+21 | |
| * | | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -96/+96 | |
| |\ \ \ | | |/ / | ||||||
| | * | | update tests | Sergei Golubchik | 2011-12-03 | 1 | -96/+96 | |
| * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 13 | -36/+48 | |
| |\ \ \ | | |/ / | ||||||
| | * | | 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 | |
| | * | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 4 | -4/+5 | |
| | |\ \ | | | |/ | ||||||
| | | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 4 | -4/+5 | |
| | * | | 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 | 1 | -2/+2 | |
| | | * | 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 | 1 | -1/+1 | |
| | * | | Automatic merge | Michael Widenius | 2011-11-24 | 5 | -10/+14 | |
| | |\ \ | ||||||
| | | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 12 | -35/+28 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | 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 | 4 | -7/+7 | |
| | | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 | |
| * | | | | bug 857066 Wrong result with ST_DISJOINT when using an index | Alexey Botchkov | 2011-11-29 | 1 | -1/+1 | |
* | | | | | Fix compile error | Vladislav Vaintroub | 2012-01-03 | 1 | -3/+4 | |
* | | | | | Fix compile warnings | Sergey Petrunya | 2012-01-02 | 1 | -2/+2 |