summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge fix for BUG#920132Sergey Petrunya2012-02-223-0/+68
|\
| * BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050Sergey Petrunya2012-02-213-0/+68
* | 5.3 mergeSergei Golubchik2012-02-2157-254/+857
|\ \
| * | fix forSergei Golubchik2012-02-201-1/+0
| * | Automatic mergeMichael Widenius2012-02-2146-332/+941
| |\ \
| | * \ Automatic mergeMichael Widenius2012-02-211-1/+1
| | |\ \
| | | * | Fixed wrong test caseMichael Widenius2012-02-211-0/+1
| | * | | Automatic mergeMichael Widenius2012-02-212-12/+18
| | |\ \ \ | | | |/ /
| | | * | Merge with 5.1Michael Widenius2012-02-212-4/+4
| | | |\ \
| | | | * \ Automatic mergeMichael Widenius2012-02-213-127/+11
| | | | |\ \
| | | | | * | More general handling of memory loss in dlclose (backported from 5.2)Michael Widenius2012-02-213-127/+11
| | | * | | | Automatic mergeMichael Widenius2012-02-211-0/+6
| | | |\ \ \ \
| | | | * | | | Added missing signal values to signal_handler.ccMichael Widenius2012-02-211-0/+6
| | | * | | | | mergeVladislav Vaintroub2012-02-203-10/+15
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Fix compilation on Windows, and various Windows related mistakes introduced byVladislav Vaintroub2012-02-201-8/+14
| | | | | |/ / | | | | |/| |
| | * | | | | Merge with MariaDB 5.2Michael Widenius2012-02-2144-328/+931
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge with 5.1Michael Widenius2012-02-202-2/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ /
| | | | * | Fixed compiler warningsMichael Widenius2012-02-202-2/+1
| | | * | | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-2039-302/+846
| | | |\ \ \ | | | | |/ /
| | | | * | Merge with MYSQL 5.1.61Michael Widenius2012-02-2037-297/+837
| | | | |\ \
| | | | | * | Fixes required to build on AIXKaren Langford2012-01-114-6/+6
| | | | * | | mergeVladislav Vaintroub2012-02-111-14/+21
| | | | |\ \ \
| | | | * | | | mtr runs only "big" tests, if --big-test is repeated twiceSergei Golubchik2012-01-252-2/+10
| | | | * | | | report innodb_file_per_table, innodb_flush_log_at_trx_commit, innodb_flush_me...Sergei Golubchik2012-01-041-0/+1
| | | * | | | | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check...Michael Widenius2012-02-203-7/+16
| | | * | | | | Fixed LP bug #933117.Igor Babaev2012-02-163-2/+36
| | * | | | | | Fixed issue found by buildbotMichael Widenius2012-02-201-1/+1
| * | | | | | | BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, S...Sergey Petrunya2012-02-203-1/+149
| |/ / / / / /
| * | | | | | MergeSergey Petrunya2012-02-204-1/+52
| |\ \ \ \ \ \
| | * | | | | | BUG#933407: Valgrind warnings in mark_as_null_row with materialization+semijo...Sergey Petrunya2012-02-204-1/+52
| * | | | | | | Fixed bug #934348.Igor Babaev2012-02-183-3/+83
| * | | | | | | Fixed LP bug #934342.Igor Babaev2012-02-183-5/+150
| * | | | | | | Remove engine-specific (but identical) icp callbacks. create one reusableSergei Golubchik2012-02-178-80/+33
| * | | | | | | Fixed LP bug #928352.Igor Babaev2012-02-161-3/+13
| * | | | | | | Backport of:Sergey Petrunya2012-02-1610-35/+45
| * | | | | | | Added commentsSergey Petrunya2012-02-161-1/+6
| * | | | | | | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-1616-6/+181
* | | | | | | | fix the include guards and add missing gplv2 headersSergei Golubchik2012-02-1718-2/+260
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | BUG#919878: Assertion `!eliminated_tables...Sergey Petrunya2012-02-213-2/+62
* | | | | | | Workaround buggy Linux dtrace - it fails on fedora if CC is set to 'ccache gcc'Vladislav Vaintroub2012-02-201-1/+7
* | | | | | | mergeSergei Golubchik2012-02-15117-2204/+4695
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 5.3.4 mergeSergei Golubchik2012-02-15117-2204/+4695
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupalunknown2012-02-147-8/+82
| | * | | | | | MDEV-59 Review and push crashsafe GIS keys.Alexey Botchkov2012-02-143-0/+129
| | |/ / / / /
| | * | | | | Merge fix for BUG#928048Sergey Petrunya2012-02-144-3/+56
| | |\ \ \ \ \
| | | * | | | | BUG#928048: Query containing IN subquery with OR in the where clause returns ...Sergey Petrunya2012-02-144-3/+56
| | * | | | | | Fixed LP bug #925985.Igor Babaev2012-02-134-2/+74
| | * | | | | | When we fail during slave thread initialisation, keep mi->run_lockunknown2012-02-131-4/+4
| | * | | | | | mergeVladislav Vaintroub2012-02-121-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Use newly released HeidiSQL 7.0 in the MSI installerVladislav Vaintroub2012-02-121-1/+1