summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-02-248-40/+31
|\
| * Automatic mergeMichael Widenius2012-02-234-110/+141
| |\
| | * Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope...Michael Widenius2012-02-234-110/+141
| * | 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-223-13/+16
| * | Changed names of statistic variables and counting matches instaed of rejected...unknown2012-02-224-13/+13
| * | lp:923429 Crash in decimal_cmp on using UNIX_TIMESTAMP with a wrongly formatt...Sergei Golubchik2012-02-212-13/+0
| |/
| * Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-211-0/+1
* | Merge fix for BUG#920132Sergey Petrunya2012-02-221-0/+6
|\ \
| * | BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050Sergey Petrunya2012-02-211-0/+6
* | | 5.3 mergeSergei Golubchik2012-02-2113-54/+158
|\ \ \ | | |/ | |/|
| * | Automatic mergeMichael Widenius2012-02-211-10/+16
| |\ \
| | * \ Merge with 5.1Michael Widenius2012-02-211-2/+2
| | |\ \
| | | * \ Automatic mergeMichael Widenius2012-02-211-2/+2
| | | |\ \
| | | | * | More general handling of memory loss in dlclose (backported from 5.2)Michael Widenius2012-02-211-2/+2
| | * | | | Automatic mergeMichael Widenius2012-02-211-0/+6
| | |\ \ \ \
| | | * | | | Added missing signal values to signal_handler.ccMichael Widenius2012-02-211-0/+6
| | * | | | | mergeVladislav Vaintroub2012-02-202-9/+14
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Fix compilation on Windows, and various Windows related mistakes introduced byVladislav Vaintroub2012-02-201-8/+14
| | | | |/ / | | | |/| |
| * | | | | Merge with MariaDB 5.2Michael Widenius2012-02-216-209/+314
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with 5.1Michael Widenius2012-02-201-1/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Fixed compiler warningsMichael Widenius2012-02-201-1/+0
| | * | | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-206-191/+289
| | |\ \ \ | | | |/ /
| | | * | Merge with MYSQL 5.1.61Michael Widenius2012-02-206-187/+290
| | | |\ \
| | | * \ \ mergeVladislav Vaintroub2012-02-111-14/+21
| | | |\ \ \
| | * | | | | Fixed LP bug #933117.Igor Babaev2012-02-161-2/+7
| | * | | | | mergeVladislav Vaintroub2012-02-111-14/+20
| | |\ \ \ \ \
| * | \ \ \ \ \ MergeSergey Petrunya2012-02-201-1/+13
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#933407: Valgrind warnings in mark_as_null_row with materialization+semijo...Sergey Petrunya2012-02-201-1/+13
| * | | | | | | | Fixed bug #934348.Igor Babaev2012-02-181-3/+2
| * | | | | | | | Fixed LP bug #934342.Igor Babaev2012-02-181-5/+16
| * | | | | | | | Remove engine-specific (but identical) icp callbacks. create one reusableSergei Golubchik2012-02-172-0/+25
| * | | | | | | | Fixed LP bug #928352.Igor Babaev2012-02-161-3/+13
| * | | | | | | | Backport of:Sergey Petrunya2012-02-161-2/+12
| * | | | | | | | Added commentsSergey Petrunya2012-02-161-1/+6
| * | | | | | | | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-164-2/+26
* | | | | | | | | fix the include guards and add missing gplv2 headersSergei Golubchik2012-02-1711-0/+175
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | BUG#919878: Assertion `!eliminated_tables...Sergey Petrunya2012-02-211-2/+25
* | | | | | | | 5.3.4 mergeSergei Golubchik2012-02-1532-127/+443
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupalunknown2012-02-145-8/+63
| |/ / / / / /
| * | | | | | Merge fix for BUG#928048Sergey Petrunya2012-02-141-3/+4
| |\ \ \ \ \ \
| | * | | | | | BUG#928048: Query containing IN subquery with OR in the where clause returns ...Sergey Petrunya2012-02-141-3/+4
| * | | | | | | Fixed LP bug #925985.Igor Babaev2012-02-132-2/+4
| * | | | | | | When we fail during slave thread initialisation, keep mi->run_lockunknown2012-02-131-4/+4
| * | | | | | | mergeVladislav Vaintroub2012-02-111-14/+20
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Fix for MDEV-140, LPBug#930145 - broken SSL connectivity for some connectorsVladislav Vaintroub2012-02-111-14/+20
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | A recent change in the server protocol code broke SSL connection for some cli...Vladislav Vaintroub2012-02-111-14/+21
| * | | | | | | Merge fix for lp:910817: Race condition in kill_threads_for_user().unknown2012-02-101-3/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge fix for lp:910817: Race condition in kill_threads_for_user().unknown2012-02-101-3/+13
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Fixed that prepared statements are properly igored (if possible) by query cache.Michael Widenius2012-02-101-0/+25
| |/ / / / / / /