summaryrefslogtreecommitdiff
path: root/storage/maria/ha_maria.cc
Commit message (Expand)AuthorAgeFilesLines
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-6/+6
* 10.0-base mergeSergei Golubchik2013-01-311-0/+3
|\
| * 5.5 mergeSergei Golubchik2013-01-291-0/+3
| |\
| | * Fixed MDEV-3890: Server crash inserting record on a temporary table after tru...Michael Widenius2013-01-251-0/+3
* | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-4/+20
|\ \ \ | |/ /
| * | The patch for the task mdev-539.Igor Babaev2012-12-201-4/+20
* | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-3/+4
|\ \ \ | |/ /
| * | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-3/+4
| |\ \ | | |/
| | * 5.3->5.5 mergeSergei Golubchik2012-11-221-3/+4
| | |\
| | | * Merge 5.2 -> 5.3unknown2012-11-011-3/+4
| | | |\
| | | | * Merge 5.1 -> 5.2unknown2012-11-011-3/+4
| | | | |\
| | | | | * Fixed MDEV-612, LP:1010759 - Valgrind error ha_maria::check_if_incompatible_d...Michael Widenius2012-10-311-3/+4
| | | * | | mergeSergei Golubchik2012-09-271-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Merge from 5.1.unknown2012-09-261-1/+1
| | | | |\ \ | | | | | |/
| | | | | * Fix some failures in 5.1 Buildbot:unknown2012-09-261-3/+3
| * | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-6/+0
| |/ / / /
* | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-1/+23
|\ \ \ \ \ | |/ / / /
| * | | | Fixed compiler errorsMichael Widenius2012-08-141-1/+1
| * | | | Merge 5.3->5.5Sergey Petrunya2012-07-181-0/+22
| |\ \ \ \ | | |/ / /
| | * | | MDEV-398: Sergv related to spacial queriesSergey Petrunya2012-07-181-0/+22
* | | | | fixes for test failuresSergei Golubchik2012-09-271-8/+12
* | | | | Added support of thd->tx_read_onlyMichael Widenius2012-08-071-6/+0
* | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-2/+2
|/ / / /
* | | | Fixed lp:997460 Truncate table on partitioned Aria table fails with ER_ILLEGA...Michael Widenius2012-05-181-55/+59
* | | | Merge of compatibility fixesMichael Widenius2012-04-021-1/+25
|\ \ \ \ | |/ / /
| * | | Merge from 5.2Michael Widenius2012-03-301-1/+1
| |\ \ \ | | |/ /
| | * | Automatic mergeMichael Widenius2012-03-301-1/+1
| | |\ \ | | | |/
| | | * Fixed bug lp:967914 "CHECK TABLE persistently reports table corruption after ...Michael Widenius2012-03-301-1/+1
| * | | mergeSergei Golubchik2012-03-301-1/+1
| |\ \ \ | | |/ /
| | * | mergeSergei Golubchik2012-03-291-1/+1
| | |\ \ | | | |/
| | | * make the code compile againSergei Golubchik2012-03-291-1/+1
| * | | Automatic mergeMichael Widenius2012-03-281-0/+24
| |\ \ \ | | |/ /
| | * | Merge with 5.1Michael Widenius2012-03-281-0/+23
| | |\ \ | | | |/
| | | * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-281-0/+23
* | | | Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed i...Michael Widenius2012-03-201-2/+15
* | | | Merge 5.3->5.5.Igor Babaev2012-03-011-3/+6
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-02-281-3/+6
| |\ \ \ | | |/ /
| | * | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'"Michael Widenius2012-02-281-4/+7
| | * | compilation warning - unused variableSergei Golubchik2011-12-221-1/+1
* | | | 5.3 mergeSergei Golubchik2012-02-211-18/+3
|\ \ \ \ | |/ / /
| * | | Remove engine-specific (but identical) icp callbacks. create one reusableSergei Golubchik2012-02-171-24/+3
| * | | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-161-1/+7
* | | | 5.3 mergeSergei Golubchik2012-01-131-17/+25
|\ \ \ \ | |/ / /
| * | | Fix unused variable 'thd' error.Sergey Petrunya2011-12-151-1/+1
| * | | Merge with 5.2Michael Widenius2011-12-141-2/+10
| |\ \ \ | | |/ /
| | * | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETEMichael Widenius2011-12-131-2/+10
| * | | Merge with 5.2.Michael Widenius2011-12-111-15/+15
| |\ \ \ | | |/ /
| | * | Fixed some Aria limits to be more saneMichael Widenius2011-12-021-3/+3
| | * | Fixed bug where automaticly zerofilled table was not part of recovery if cras...Michael Widenius2011-12-021-0/+4
| | * | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-12/+8
| | |\ \ | | | |/