summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* make the test result independent from sizeof(void*)Sergei Golubchik2012-02-252-3/+5
* 5.3 mergeSergei Golubchik2012-02-2435-277/+351
|\
| * Removed const declarations to get rid of compiler warnings. The changes are s...Michael Widenius2012-02-244-11/+11
| * Automatic mergeMichael Widenius2012-02-2311-125/+182
| |\
| | * Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1Michael Widenius2012-02-236-4/+11
| | * Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope...Michael Widenius2012-02-235-121/+171
| * | Don't run test for BUG#933412 with embedded server, as it requires concurrent...Sergey Petrunya2012-02-224-143/+158
| * | Sort counters by their names (otherwise, the order of SHOW STATUS output is s...Sergey Petrunya2012-02-221-3/+4
| * | Added back MRR counters. The new names are: Handler_mrr_init, Sergey Petrunya2012-02-226-14/+41
| * | Changed names of statistic variables and counting matches instaed of rejected...unknown2012-02-2212-65/+65
| * | lp:923429 Crash in decimal_cmp on using UNIX_TIMESTAMP with a wrongly formatt...Sergei Golubchik2012-02-214-13/+20
| |/
| * Merge with 5.2Michael Widenius2012-02-211-1/+1
| |\
| | * Automatic merge with 5.1Michael Widenius2012-02-211-1/+1
| | |\
| | | * Fixed suppression expression.Michael Widenius2012-02-211-1/+1
| * | | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-217-14/+23
* | | | disable safemalloc for valgrind builds.Sergei Golubchik2012-02-236-15/+11
* | | | 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