summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* 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-012-4/+4
* automatic merge with 5.5Michael Widenius2012-06-274-20/+28
|\
| * Fixed MDEV-348: 5.5 valgrind warinings on maria testsMichael Widenius2012-06-201-14/+20
| * Fixed MDEV-306 / LP:1007967 - Assertion `table->file->stats.records > 0 || er...Michael Widenius2012-06-154-9/+11
* | Merge with 5.5Michael Widenius2012-06-081-4/+22
|\ \ | |/
| * merge with 5.3.Sergei Golubchik2012-06-041-4/+22
| |\
| | * MDEV-294 SELECT WHERE ST_CONTAINS doesn't return all the records where ST_CON...Alexey Botchkov2012-05-291-4/+22
* | | Fixed build failures found by buildbotMichael Widenius2012-06-053-1/+6
|/ /
* | Building RPMs with CPackSergei Golubchik2012-05-221-5/+5
* | Fixed compile warningsMichael Widenius2012-05-182-0/+4
* | Fixed lp:997460 Truncate table on partitioned Aria table fails with ER_ILLEGA...Michael Widenius2012-05-181-55/+59
* | 5.3 mergeSergei Golubchik2012-05-042-1/+71
|\ \ | |/
| * MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-04-232-1/+73
* | Fixed some simple warnings on Windows.Vladislav Vaintroub2012-04-132-2/+4
* | Fix build on OSXVladislav Vaintroub2012-04-121-0/+5
* | Merge of compatibility fixesMichael Widenius2012-04-023-5/+33
|\ \ | |/
| * 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-283-4/+32
| |\ \ \ | | |/ /
| | * | Merge with 5.1Michael Widenius2012-03-283-4/+31
| | |\ \ | | | |/
| | | * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-283-4/+31
* | | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-1/+2
|\ \ \ \ | |/ / /
| * | | Speedups:Michael Widenius2012-03-231-1/+2
* | | | Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed i...Michael Widenius2012-03-204-6/+28
* | | | Cleanups:Michael Widenius2012-03-204-4/+28
* | | | monty's cleanup of my_thr_init.cSergei Golubchik2012-03-131-2/+1
* | | | 5.3 mergeSergei Golubchik2012-03-062-1/+9
|\ \ \ \ | |/ / /
| * | | Automatic mergeMichael Widenius2012-03-054-4/+18
| |\ \ \
| | * | | Ensure that we mark all processed tables as 'properly closed'.Michael Widenius2012-03-051-0/+8
| | * | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke...Michael Widenius2012-02-283-4/+10
* | | | | Merge 5.3->5.5.Igor Babaev2012-03-016-8/+23
|\ \ \ \ \ | |/ / / /
| * | | | mergeSergei Golubchik2012-02-285-5/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'"Michael Widenius2012-02-284-5/+14
| * | | | Merge 5.2->5.3Sergey Petrunya2012-02-241-3/+9
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Automatic mergeMichael Widenius2012-02-241-3/+9
| | |\ \ | | | |/
| | | * Fix for lp:909635: MariaDB crashes on a select with long varchar and blob fieldsMichael Widenius2012-02-241-3/+9
* | | | 5.3 mergeSergei Golubchik2012-02-212-20/+8
|\ \ \ \ | |/ / /
| * | | Merge with MariaDB 5.2Michael Widenius2012-02-211-2/+5
| |\ \ \ | | |/ /
| | * | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check...Michael Widenius2012-02-201-2/+5
| | * | 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 the include guards and add missing gplv2 headersSergei Golubchik2012-02-172-0/+32
* | | | Fixed tests consumed big amount of disk space to be "BIG".unknown2012-01-273-4/+18
* | | | 5.3 mergeSergei Golubchik2012-01-1315-137/+165
|\ \ \ \ | |/ / /