summaryrefslogtreecommitdiff
path: root/storage/innobase/include/row0merge.h
Commit message (Expand)AuthorAgeFilesLines
* cleanup: InnoDB, remove index_field_t::col_nameSergei Golubchik2016-12-121-1/+0
* Merge InnoDB 5.7 from mysql-5.7.14.Jan Lindström2016-09-081-28/+58
* Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-021-81/+86
* Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-17/+17
|\
| * Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-211-19/+19
| |\
| | * 5.6.31Sergei Golubchik2016-06-211-19/+19
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-13/+18
|\ \ \ | |/ /
| * | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-171-11/+13
| |\ \
| | * \ Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-02-161-11/+13
| | |\ \ | | | |/
| | | * 5.6.29Sergei Golubchik2016-02-161-11/+13
| | | * move to storage/innobaseSergei Golubchik2015-05-041-0/+430
| * | MDEV-9548: Alter table (renaming and adding index) fails with "Incorrect key ...Jan Lindström2016-02-151-1/+4
| |/
* | MDEV-9129: Server is restarting in the loop after crashJan Lindström2015-12-151-0/+3
* | MDEV-8774: Test innodb.innodb_bug53290 failures on buildbotJan Lindström2015-09-081-1/+1
* | MDEV-8774: Test innodb.innodb_bug53290 failures on buildbotJan Lindström2015-09-081-1/+1
* | MDEV-8708: InnoDB temp file encryptionJan Lindström2015-09-081-4/+19
* | Merge 10.0 -> 10.1Kristian Nielsen2015-04-201-0/+1
|\ \ | |/
| * MDEV-7367: Updating a virtual column corrupts table which crashes serverJan Lindström2015-03-311-0/+1
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-1/+1
|\ \ | |/
| * innodb 5.6.23Sergei Golubchik2015-02-181-1/+1
* | MDEV-6812: Merge Kakao: Add global status variables which tellJan Lindström2014-09-301-1/+16
|/
* MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-5/+5
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-119/+165
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-8/+195
* Import branches/innodb+ from SVN on top of storage/innobase.Vasil Dimov2010-04-121-1/+1
* Backport of:Konstantin Osipov2009-10-141-1/+1
* Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-071-0/+197
View Lorry Controller Status