summaryrefslogtreecommitdiff
path: root/storage/maria/ha_maria.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | 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
| |\
| | * Fixed that maria-recover works as expected.Michael Widenius2011-11-291-10/+6
| | * Fixed that one can use --maria-recover=backup,forceMichael Widenius2011-11-241-2/+2
* | | Backported the fix and the test case for bug #58816 from mysql-5.6 code line.Igor Babaev2011-10-291-3/+0
* | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-261-2/+9
* | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-1/+1
* | | Merge with 5.2Michael Widenius2011-09-151-1/+1
|\ \ \ | |/ /
| * | Increased version numberMichael Widenius2011-09-131-1/+1
* | | Merge 5.2->5.3unknown2011-09-021-4/+21
|\ \ \ | |/ /
| * | Added variable ARIA_CHECKPOINT_LOG_ACTIVITY to allow one to specify how often...Michael Widenius2011-09-011-4/+21
* | | Automatic merge with 5.2Michael Widenius2011-08-151-1/+1
|\ \ \ | |/ /
| * | Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000:...Michael Widenius2011-08-151-1/+1
| * | Aria bug fixes and improvements:Michael Widenius2011-06-301-9/+11
* | | Valgrind fix for the previous cset:Sergey Petrunya2011-07-151-0/+1
* | | BUG#778434 Wrong result with in_to_exists=on in maria-5.3-mwl89Sergey Petrunya2011-07-141-1/+8
* | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-12/+61
* | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_writeMichael Widenius2011-06-271-1/+1
* | | Merge of mwl #106 into 5.3. Igor Babaev2011-06-151-1/+1
|\ \ \
| * \ \ Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-1/+1
| |\ \ \
| | * \ \ MergeIgor Babaev2011-05-201-1/+1
| | |\ \ \
| | | * \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-1/+1
| | | |\ \ \
* | | | | | | Fixed build failures with maria3.test and widows buildMichael Widenius2011-06-111-1/+2
* | | | | | | Removed depricated --maria-options from mysqld.Michael Widenius2011-06-091-3/+0
|/ / / / / /
* | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-0/+2
|/ / / / /
* | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-2/+3
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge with MariaDB 5.1Michael Widenius2011-05-031-2/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-2/+3
* | | | mysql-test/suite/funcs_1/r/storedproc.result:Michael Widenius2011-05-021-2/+3
* | | | Added ALTER ONLINE TABLE, which will give an error if the change can't be don...Michael Widenius2011-04-281-4/+15
* | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"Michael Widenius2011-04-281-0/+9
* | | | Make EXPLAIN better at displaying MRR/BKA:Sergey Petrunya2011-04-021-0/+5
* | | | Merge with 5.2Michael Widenius2011-03-091-20/+24
|\ \ \ \ | |/ / /
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-20/+24
| |\ \ \ | | |/ /
| | * | Fixes for Aria storage engine:Michael Widenius2011-02-101-9/+13
| | * | Aria issues:Michael Widenius2011-01-241-11/+11
| * | | Merge with alias as StringMichael Widenius2011-02-281-3/+3
| |\ \ \
| | * | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-3/+3
* | | | | MRR interface: change range_info's type from char* to range_id_t typedef. The...Sergey Petrunya2011-03-041-1/+1
* | | | | Merge in new handler and handlersocket code into 5.3 mainMichael Widenius2011-02-221-17/+6
|\ \ \ \ \