summaryrefslogtreecommitdiff
path: root/storage/innobase/include/dict0mem.h
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-6/+5
|\
| * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-6/+5
| |\
| | * MDEV-7049 MySQL#74585 - InnoDB: Failing assertion: *mbmaxlen < 5 in file ha_i...Marko Mäkelä2018-01-221-5/+5
* | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-1/+3
|\ \ \ | |/ /
| * | Merge branch 'merge-innodb-5.6' into 10.0Vicențiu Ciorbaru2017-10-261-1/+3
| |\ \
| | * | 5.6.38Vicențiu Ciorbaru2017-10-251-1/+3
* | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fix gcc 6.3.x compiler warnings.Jan Lindström2017-02-161-6/+6
| | * | Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY REFERENCES ISAnnamalai Gurusami2014-06-101-2/+10
| | * | Merge from mysql-5.1 to mysql-5.5Annamalai Gurusami2013-03-291-1/+1
| | |\ \
| | | * | Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OFAnnamalai Gurusami2013-03-291-1/+1
| | | * | Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF Annamalai Gurusami2013-03-281-4/+21
| | * | | Merge from mysql-5.1 to mysql-5.5Annamalai Gurusami2013-03-281-1/+1
| | |\ \ \
| | | * | | Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF Annamalai Gurusami2013-03-271-4/+21
| | | |/ /
| | * | | Fix Bug#16400412 UNNECESSARY DICT_UPDATE_STATISTICS DURING CONCURRENTVasil Dimov2013-03-181-2/+8
| | * | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-081-1/+6
| | |\ \ \ | | | |/ /
* | | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-241-8/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-211-8/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 5.6.31Sergei Golubchik2016-06-211-8/+8
* | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-0/+17
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADDJan Lindström2016-04-221-0/+17
* | | | | Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-4/+119
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'Buggynours:10.0' into 10.0Sergei Golubchik2015-05-051-0/+1
| |\ \ \ \
| | * | | | Add #include <ostream> in dict0mem.h and change iterator to const_iterator in...Buggynours2015-03-031-0/+1
| * | | | | InnoDB-5.6.24Sergei Golubchik2015-05-051-4/+118
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 5.6.24Sergei Golubchik2015-05-041-4/+118
| | * | | move to storage/innobaseSergei Golubchik2015-05-041-0/+1214
| | / /
* | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-8/+84
|\ \ \ \ | |/ / /
| * | | InnoDB 5.6.21Sergei Golubchik2014-11-201-8/+72
| * | | MDEV-6926: innodb_rows_updated is misleading on slavJan Lindström2014-10-261-0/+12
* | | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-10/+124
|\ \ \ \ | |/ / /
| * | | InnoDB 5.6.20Sergei Golubchik2014-09-111-10/+124
* | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-1/+12
|\ \ \ \ | |/ / /
| * | | innodb-5.6.19Sergei Golubchik2014-08-061-1/+6
| * | | MDEV-6470: Restrict number of error messages about persistent statictic table...Jan Lindström2014-07-221-0/+6
* | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-1/+29
|\ \ \ \ | |/ / /
| * | | MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-1/+29
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-3/+5
|\ \ \ \ | |/ / /
| * | | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-3/+5
* | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-42/+255
|\ \ \ \ | |/ / /
| * | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-42/+255
* | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+3
|/ / /
* | | 10.0-base mergeSergei Golubchik2013-01-311-1/+6
|\ \ \
| * \ \ 5.3 mergeSergei Golubchik2013-01-151-1/+6
| |\ \ \ | | |/ / | |/| / | | |/
| | * Bug#14731482 UPDATE OR DELETE CORRUPTS A RECORD WITH A LONG PRIMARY KEYMarko Mäkelä2012-10-081-1/+6
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-71/+166
|/ /
* | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-281-4/+6
|\ \ | |/
* | Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES.Jimmy Yang2011-08-161-5/+9
* | Implement worklog #5743 InnoDB: Lift the limit of index key prefixes. Jimmy Yang2011-05-311-8/+34