summaryrefslogtreecommitdiff
path: root/storage/xtradb
Commit message (Expand)AuthorAgeFilesLines
* 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
* | mergemariadb-5.2.12Sergei Golubchik2012-04-051-1/+3
|\ \
| * | mysql-5.1.62 mergemariadb-5.1.62Sergei Golubchik2012-04-051-1/+3
* | | mergeSergei Golubchik2012-03-211-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Fix access to uninitialized variable in innodb error message in case WriteFil...Vladislav Vaintroub2012-03-151-1/+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
* | 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
| * typos fixedSergei Golubchik2011-11-081-1/+1
| * Fix gcc 4.6 warnings about assigned but not used variables.unknown2011-10-273-8/+7
* | merge with 5.1Sergei Golubchik2011-10-072-9/+2
|\ \ | |/
| * support for plugins on windowsSergei Golubchik2011-10-041-8/+2
| * remove redundant declarationsSergei Golubchik2011-10-041-1/+0
* | Fix Windows embedded warningsVladislav Vaintroub2011-05-101-3/+4
* | Automatic merge with 5.1Michael Widenius2011-05-041-1/+1
|\ \ | |/
| * Fixed compiler warningMichael Widenius2011-05-041-1/+1
* | Automatic merge with MariaDB 5.1Michael Widenius2011-05-034-6/+5
|\ \ | |/
| * Automatic mergeMichael Widenius2011-05-032-4/+2
| |\
| | * Fixed after-merge failures found by buildbotMichael Widenius2011-05-032-4/+2
| * | Fix Xtradb compile error on Win64 - conversion between pointers of different ...Vladislav Vaintroub2011-05-031-1/+1
| * | Fix compile errors:Vladislav Vaintroub2011-05-021-1/+2
| |/
* | Merge with MariaDB 5.1Michael Widenius2011-05-0358-875/+1233
|\ \ | |/
| * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-2958-875/+1233
* | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2861-758/+2364
|\ \ | |/
| * Fixed compiler warningsMichael Widenius2011-02-251-2/+2
| * - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testingMichael Widenius2011-02-253-2/+3
| * - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed...Michael Widenius2011-02-241-0/+2
| * Fixed build failuresMichael Widenius2011-02-232-4/+5
| * Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-2227-404/+671
| * Merge with xtradb code changesMichael Widenius2011-02-2248-427/+1762
| |\
| | * Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-0448-427/+1762
| * | Fixed compiler warningsMichael Widenius2011-02-101-1/+1
| |/
| * Fixed bugs found by buildbot:Michael Widenius2011-01-261-1/+1
* | Fixed typosMichael Widenius2011-01-071-1/+1
* | virtual columns:Sergei Golubchik2010-12-312-2/+1
* | merge with 5.1Michael Widenius2010-12-131-23/+10
|\ \ | |/
| * Mbug#677407 / MySQL Bug#48883: Stale data from INNODB_LOCKS table.unknown2010-11-191-23/+10
* | mergeVladislav Vaintroub2010-12-061-2/+0
|\ \ | |/
| * mergeVladislav Vaintroub2010-12-061-2/+0
| |\
View Lorry Controller Status