summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-02-219-76/+19
|\
| * fix forSergei Golubchik2012-02-201-1/+0
| * Automatic mergeMichael Widenius2012-02-2112-21/+71
| |\
| | * Merge with MariaDB 5.2Michael Widenius2012-02-2112-21/+71
| | |\
| | | * Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-2011-19/+66
| | | |\
| | | | * Merge with MYSQL 5.1.61Michael Widenius2012-02-2011-19/+66
| | | | |\
| | | | | * merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-12-155-3/+18
| | | | | |\
| | | * | | | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check...Michael Widenius2012-02-201-2/+5
| * | | | | | BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, S...Sergey Petrunya2012-02-201-1/+5
| |/ / / / /
| * | | | | Remove engine-specific (but identical) icp callbacks. create one reusableSergei Golubchik2012-02-176-80/+8
| * | | | | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-164-3/+23
* | | | | | fix the include guards and add missing gplv2 headersSergei Golubchik2012-02-172-0/+32
* | | | | | mergeSergei Golubchik2012-02-152-25/+49
|\ \ \ \ \ \
| * \ \ \ \ \ 5.3.4 mergeSergei Golubchik2012-02-152-25/+49
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Back-ported the fix for bug #12831587 from mysql-5.6 code line.Igor Babaev2012-02-031-10/+30
| | * | | | | Applied the patch from mysql-5.6 code line that fixedIgor Babaev2012-02-021-13/+16
| | * | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-012-8/+10
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | on windows: don't link all plugins with mysqld, only do it for storage engines.Sergei Golubchik2011-12-291-1/+3
| | | * | | | LPBUG#906638 : Fixes to build oqgraph with boost 1.48 Vladislav Vaintroub2011-12-221-7/+7
| | | * | | | compilation warning - unused variableSergei Golubchik2011-12-221-1/+1
| | * | | | | Fix compiler warning on Windows.Vladislav Vaintroub2012-01-191-0/+1
* | | | | | | Fix wrong type causing build failure on windows.unknown2012-02-152-2/+2
* | | | | | | Fix wrong type causing build failure on windows.unknown2012-02-151-1/+1
* | | | | | | Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5.unknown2012-02-1545-988/+1100
|/ / / / / /
* | | | | | Merge MySQL 5.5.20 into MariaDB 5.5.unknown2012-02-141-0/+3
|\ \ \ \ \ \
| * \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-12-153-2/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merged bug#12361113.Mattias Jonsson2011-12-141-0/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | mergeMattias Jonsson2011-12-141-0/+3
| | * | | | | | merge 5.1->5.1-security.Georgi Kodinov2011-12-1212-78/+137
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ auto-merge mysql-5.1->mysql-5.5Georgi Kodinov2011-11-042-1/+7
| | |\ \ \ \ \ \ \
* | | | | | | | | | Various fixes for Solaris compiler.Vladislav Vaintroub2012-02-032-3/+5
* | | | | | | | | | MDEV-100 : innodb_plugin tests fail on Solaris.Vladislav Vaintroub2012-02-022-1/+21
* | | | | | | | | | remove building pbxt by default in any configuration (need explicit ./configu...unknown2012-01-301-0/+5
* | | | | | | | | | Fixed tests consumed big amount of disk space to be "BIG".unknown2012-01-273-4/+18
* | | | | | | | | | fix embedded buildVladislav Vaintroub2012-01-261-0/+1
* | | | | | | | | | Xtradb recently started to access thd members directly ,e.g thd->stmt_da (ha...Vladislav Vaintroub2012-01-262-1/+2
* | | | | | | | | | Always define UT_DBG_ABORT in innodb/xtradb, also on Windows. This will avoid...Vladislav Vaintroub2012-01-252-10/+14
* | | | | | | | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO";Michael Widenius2012-01-242-4/+17
* | | | | | | | | | portability fixes for FreeBSD 8 and 9Vladislav Vaintroub2012-01-231-1/+1
* | | | | | | | | | Fix innodb_bug60229 (get the innodb change into xtradb)Vladislav Vaintroub2012-01-191-0/+5
* | | | | | | | | | enable test cases for bugs fixed in xtradb.Sergei Golubchik2012-01-162-2/+2
* | | | | | | | | | mysql-5.5 mergeSergei Golubchik2012-01-1642-674/+822
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-294-43/+55
| * | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-293-33/+76
| * | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-295-23/+45
| * | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-296-20/+70
| * | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-291-1/+1
| * | | | | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-12-287-140/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#13418934 REMOVE HAVE_PURIFY DEPENDENCES FROM INNODBMarko Mäkelä2011-12-2815-302/+16
| * | | | | | | | | | | Auto-merge from mysql-5.1.Ramil Kalimullin2011-12-231-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /