summaryrefslogtreecommitdiff
path: root/storage/xtradb/dict/dict0dict.c
Commit message (Expand)AuthorAgeFilesLines
* merged with XtraDB 1.1.8-26.0Sergei Golubchik2012-06-151-10/+32
* Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5.unknown2012-02-151-0/+5
* Fix innodb_bug60229 (get the innodb change into xtradb)Vladislav Vaintroub2012-01-191-0/+5
* Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5unknown2011-12-151-4/+188
* 5.3->5.5 mergeSergei Golubchik2011-11-221-5/+8
|\
| * Merge.Igor Babaev2011-06-011-5/+8
| |\
| | * Downported InnoDB support of Index Condition Pushdown from MySQL-5.6 code line.Igor Babaev2011-05-251-5/+8
| * | Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-291-2/+136
| |/
| * Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-221-6/+6
| * Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-041-71/+100
| * Merge XtraDB from Percona-Server 5.1.52-11.6 into MariaDB 5.1unknown2010-11-241-9/+0
* | merge with xtradb-5.5.15Sergei Golubchik2011-07-181-172/+387
|/
* Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-191-41/+42
|\
| * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-191-25/+37
* | 5.1.51 mergeSergei Golubchik2010-10-191-30/+40
|/
* Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-031-39/+345
* Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-041-13/+76
* Merge XtraDB 10 into MariaDB.unknown2010-04-281-2/+46
* Merge XtraDB 9 into MariaDB.unknown2010-01-151-8/+92
* Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-1/+1
|\
| * Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+1
* | Merge XtraDB 8 into MariaDB.unknown2009-11-131-483/+512
|/
* Merge XtraDB 6 into MariaDB.unknown2009-08-031-2/+65
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-091-0/+4747