summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-1/+0
|\
| * Merge with MYSQL 5.1.61Michael Widenius2012-02-201-1/+0
* | Merge with 5.1Michael Widenius2011-11-301-6/+7
|\ \ | |/
| * 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-301-4/+5
| * Fixed compiler warningsMichael Widenius2011-11-301-1/+1
| * Fix Windows build, and a conversion truncation warning.Vladislav Vaintroub2011-11-291-5/+4
* | merge, fix Windows warningsVladislav Vaintroub2011-11-291-1/+1
* | after merge fixesSergei Golubchik2011-11-281-5/+4
* | Merge with MariaDB 5.1Michael Widenius2011-11-245-354/+473
|\ \ | |/
| * 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-215-327/+445
| * typos fixedSergei Golubchik2011-11-081-1/+1
* | Automatic merge with MariaDB 5.1Michael Widenius2011-05-031-1/+1
|\ \ | |/
| * Fix Xtradb compile error on Win64 - conversion between pointers of different ...Vladislav Vaintroub2011-05-031-1/+1
* | Merge with MariaDB 5.1Michael Widenius2011-05-032-28/+126
|\ \ | |/
| * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-292-28/+126
* | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-284-227/+283
|\ \ | |/
| * Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-222-116/+123
| * Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-043-186/+235
* | virtual columns:Sergei Golubchik2010-12-312-2/+1
* | merge with 5.1Michael Widenius2010-11-304-51/+61
|\ \ | |/
| * Fixed compiler warnings and a compilation failure on windowsMichael Widenius2010-11-271-1/+1
| * Merge of innodb_plugin for MySQL 5.1.53 with xtradbMichael Widenius2010-11-252-26/+54
| * Merge XtraDB from Percona-Server 5.1.52-11.6 into MariaDB 5.1unknown2010-11-243-22/+4
* | merge with 5.1Sergei Golubchik2010-10-251-30/+69
|\ \ | |/
| * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-191-13/+29
| |\
| | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-191-31/+69
| * | 5.1.51 mergeSergei Golubchik2010-10-191-28/+51
| |/
* | fix incorrect xtradb plugin metadata.Sergei Golubchik2010-09-111-2/+2
* | merge with 5.1Sergei Golubchik2010-09-116-190/+470
|\ \ | |/
| * Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-036-190/+451
* | Automerge with 5.1Michael Widenius2010-08-251-1/+1
|\ \ | |/
| * Fixed compiler warnings from Windows compilerMichael Widenius2010-08-111-1/+1
* | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-5/+5
* | Merge with MariaDB 5.1.49Michael Widenius2010-08-055-346/+1016
|\ \ | |/
| * Merge with 5.1-merge (new XTRADB code updated up to MySQL 5.1.47)Michael Widenius2010-08-055-345/+1014
| |\
| | * Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-045-343/+1014
| * | Fixed some test failures after last push (failing tests and valgrind warnings)Michael Widenius2010-08-041-2/+3
| * | Fixes to allow one to compile and test innodb_pluginMichael Widenius2010-08-041-2/+2
| |/
* | Automerge MariaDB 5.1->5.2.unknown2010-07-091-5/+5
|\ \ | |/
| * Fix bug 600744Bo Thorsen2010-07-021-5/+5
* | mergeSergei Golubchik2010-06-141-2/+2
|\ \ | |/
| * allow federated and innodb_plugin to be builtSergei Golubchik2010-06-091-1/+1
* | after merge fix.Sergei Golubchik2010-06-073-0/+39
* | merge 5.1->5.2Sergei Golubchik2010-06-015-57/+757
|\ \ | |/
| * After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and...unknown2010-04-281-1/+1
| * Merge XtraDB 10 into MariaDB.unknown2010-04-285-18/+747
| * Merge XtraDB 9.1 into MariaDB.unknown2010-04-281-33/+0
| * Merge MySQL 5.1.46 into MariaDB.mariadb-merge-mysql-5.1.46unknown2010-04-281-6/+10
View Lorry Controller Status