summaryrefslogtreecommitdiff
path: root/storage/xtradb/row
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-192-8/+20
|\
| * Merge with MariaDB 5.2Michael Widenius2011-05-107-85/+140
| |\
| | * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-297-85/+140
| * | Merge with 5.2Michael Widenius2011-03-097-97/+276
| |\ \ | | |/
| | * - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testingMichael Widenius2011-02-251-1/+1
| | * Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-225-86/+250
| | * Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-045-11/+26
| * | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc...Michael Widenius2011-02-181-4/+8
| * | Post-merge fixes: fix compile failure in buildbotSergey Petrunya2010-12-061-2/+10
| * | Merge with 5.1-release.Michael Widenius2010-12-066-118/+189
| |\ \ | | |/
| | * Merge of innodb_plugin for MySQL 5.1.53 with xtradbMichael Widenius2010-11-253-67/+90
| | * Merge XtraDB from Percona-Server 5.1.52-11.6 into MariaDB 5.1unknown2010-11-245-59/+100
| * | Added TRASH() to table->record[0] to find out if we access not initialzed data.Michael Widenius2010-11-271-6/+0
| * | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-10/+6
* | | merge with xtradb-5.5.15Sergei Golubchik2011-07-1812-750/+1415
* | | lots of post-merge changesSergei Golubchik2011-04-251-6/+6
|/ /
* | 5.2 mergeSergei Golubchik2010-10-286-38/+185
|\ \ | |/
| * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-196-33/+180
* | Merge 5.2->5.3Sergey Petrunya2010-10-1010-526/+767
|\ \ | |/
| * Added missing include file (to get rid of compiler warning)Michael Widenius2010-09-061-0/+1
| * Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-039-229/+475
| * Fixed compiler warningsMichael Widenius2010-08-041-0/+6
| * Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-047-301/+285
* | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-263-1/+21
|\ \ | |/
| * Merge XtraDB 10 into MariaDB.unknown2010-04-283-1/+21
* | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-2012-1886/+1942
|\ \ | |/
| * Apply to XtraDB MySQL/build-in innodb patches for Bug#49032 and Bug#47720.unknown2010-01-151-3/+22
| * Merge XtraDB 9 into MariaDB.unknown2010-01-153-91/+243
| * Merge XtraDB 8 into MariaDB.unknown2009-11-1312-1802/+1687
* | MWL#67: MRR backportSergey Petrunya2009-12-221-23/+20
* | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-17/+90
|/
* Merge xtradb-7 -> MariaDBSergey Petrunya2009-09-082-45/+78
* Merge XtraDB 6 into MariaDB.unknown2009-08-031-0/+3
* XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/...unknown2009-06-091-1/+1
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-0912-0/+20363