summaryrefslogtreecommitdiff
path: root/storage/xtradb
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-0949-503/+4750
|\
| * Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-0849-503/+4750
| |\
| | * Merge XtraDB from Percona-Server 5.1.66-rel14.1 into MariaDB 5.1.unknown2012-11-0149-448/+4582
* | | mergeSergei Golubchik2012-09-271-6/+6
|\ \ \ | |/ /
| * | Merge from 5.1.unknown2012-09-261-6/+6
| |\ \ | | |/
| | * Fix some failures in 5.1 Buildbot:unknown2012-09-261-6/+6
* | | remove mysql-5.1 assert that is already absent in mysql-5.5Sergei Golubchik2012-08-231-1/+0
* | | 5.2 merge.Sergei Golubchik2012-08-2298-1657/+3124
|\ \ \ | |/ /
| * | 5.1 mergeSergei Golubchik2012-08-2298-1657/+3124
| |\ \ | | |/
| | * merge with XtraDB as of Percona-Server-5.1.63-rel13.4Sergei Golubchik2012-08-2298-1656/+3123
* | | MDEV-308 lp:1008516 - Failing assertion: templ->mysql_col_len == lenSergei Golubchik2012-06-041-1/+0
* | | mergeVladislav Vaintroub2012-04-161-21/+13
|\ \ \ | |/ /
| * | mergeVladislav Vaintroub2012-04-161-21/+13
| |\ \
| | * | backport a change from 5.5 to remove thread sleeps from Innodb assertions on ...Vladislav Vaintroub2012-04-161-21/+13
* | | | mergeSergei Golubchik2012-04-051-1/+3
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-04-051-1/+3
| |\ \ \ | | | |/ | | |/|
| | * | mysql-5.1.62 mergeSergei Golubchik2012-04-051-1/+3
* | | | Bug fix for MySQL bug#61209 "auto_increment_offset != 1 + innodb_autoinc_lock...Michael Widenius2012-03-261-52/+15
* | | | mergeSergei Golubchik2012-03-211-1/+1
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-03-211-1/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix access to uninitialized variable in innodb error message in case WriteFil...Vladislav Vaintroub2012-03-151-1/+1
* | | fix forSergei Golubchik2012-02-201-1/+0
* | | Merge with MariaDB 5.2Michael Widenius2012-02-212-2/+1
|\ \ \ | |/ /
| * | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-202-2/+1
| |\ \ | | |/
| | * Merge with MYSQL 5.1.61Michael Widenius2012-02-202-2/+1
* | | Remove engine-specific (but identical) icp callbacks. create one reusableSergei Golubchik2012-02-174-31/+2
* | | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-162-1/+9
* | | 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
* | | Fix compiler warning on Windows.Vladislav Vaintroub2012-01-191-0/+1
* | | MDEV-77 - possible deadlock in XtraDB async io subsystem on Windows.Vladislav Vaintroub2012-01-081-11/+45
* | | 5.2->5.3 mergeSergei Golubchik2011-12-121-1/+1
|\ \ \ | |/ /
* | | Merge with 5.2.Michael Widenius2011-12-1188-2992/+4380
|\ \ \ | |/ /
| * | Merge with 5.1Michael Widenius2011-11-304-17/+23
| |\ \ | | |/
| | * Fixed compiler warning and errorsMichael Widenius2011-11-301-2/+2
| | * Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-1/+1
| | * Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE V...unknown2011-11-303-11/+20
| | * Fixed compiler warningsMichael Widenius2011-11-302-3/+1
| | * Fix Windows build, and a conversion truncation warning.Vladislav Vaintroub2011-11-293-7/+6
| * | merge, fix Windows warningsVladislav Vaintroub2011-11-293-3/+3
| * | after merge fixesSergei Golubchik2011-11-282-6/+6
| * | Merge with MariaDB 5.1Michael Widenius2011-11-2488-2989/+4370
| |\ \ | | |/
| | * Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+1
| | * Merge XtraDB from Percona-Server-5.1.59-13 into MariaDB 5.1.unknown2011-11-2188-2954/+4335
* | | 5.2->5.3 mergeSergei Golubchik2011-11-122-3/+3
|\ \ \
| * \ \ 5.1 mergeSergei Golubchik2011-11-121-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | typos fixedSergei Golubchik2011-11-081-1/+1
| * | | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes).unknown2011-10-273-8/+7
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix gcc 4.6 warnings about assigned but not used variables.unknown2011-10-273-8/+7
* | | Remove unused variable detected by GCC 4.6.1.unknown2011-11-121-2/+1