summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler/i_s.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with xtradb-5.5.15Sergei Golubchik2011-07-181-1992/+2855
* lots of post-merge changesSergei Golubchik2011-04-251-1/+1
* merge with 5.1Sergei Golubchik2010-09-111-77/+139
|\
| * Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-031-77/+122
* | Automerge with 5.1Michael Widenius2010-08-251-1/+1
|\ \ | |/
| * Fixed compiler warnings from Windows compilerMichael Widenius2010-08-111-1/+1
* | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-8/+69
|\ \ | |/
| * Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-041-8/+69
* | after merge fix.Sergei Golubchik2010-06-071-0/+35
* | merge 5.1->5.2Sergei Golubchik2010-06-011-12/+558
|\ \ | |/
| * Merge XtraDB 10 into MariaDB.unknown2010-04-281-12/+558
* | Maria WL#61unknown2010-04-011-0/+689
|/
* Added missing space from last pushMichael Widenius2010-03-311-1/+0
* Merge with fixes for compiler warnings and 2 fixed test casesMichael Widenius2010-01-281-1/+1
* Merge XtraDB 9 into MariaDB.unknown2010-01-151-14/+183
* Merge XtraDB 8 into MariaDB.unknown2009-11-131-121/+122
* Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-1/+1
|\
| * Trivial fixes for windows compile failuresSergey Petrunya2009-09-011-2/+2
* | Make MariaDB work on windows: Sergey Petrunya2009-09-151-2/+2
|/
* Merge XtraDB 6 into MariaDB.unknown2009-08-031-2/+301
* Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-111-4/+2
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-091-0/+2657