summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/dict0dict.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-13/+1
|\
| * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-13/+1
| |\
| | * MDEV-7049 MySQL#74585 - InnoDB: Failing assertion: *mbmaxlen < 5 in file ha_i...Marko Mäkelä2018-01-221-11/+1
| | * Merge branch 'merge-xtradb-5.5' into 5.5mariadb-5.5.57Sergei Golubchik2017-07-181-8/+8
| | |\
| | | * 5.5.55-38.8Sergei Golubchik2017-07-181-8/+8
| | | * move to storage/xtradb/Sergei Golubchik2015-04-271-0/+1407
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-11/+0
|\ \ \ | |/ /
| * | MDEV-13838: Wrong result after altering a partitioned tableJan Lindström2017-10-101-11/+0
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-3/+7
|\ \ \ | |/ /
| * | MDEV-13325: InnoDB assert dict_sys->size > 0 during ALTER TABLEbb-10.0-janJan Lindström2017-07-211-3/+7
* | | Merge 10.0 into 10.1Marko Mäkelä2017-05-201-2/+2
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-171-4/+7
| |\ \
| | * | 5.6.36-82.0Vicențiu Ciorbaru2017-05-161-4/+7
* | | | MDEV-12253: Buffer pool blocks are accessed after they have been freedJan Lindström2017-04-261-18/+9
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-10/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-03-051-10/+9
| |\ \ \ | | |/ /
| | * | 5.6.35-80.0Vicențiu Ciorbaru2017-03-041-10/+9
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-01-041-47/+1
|\ \ \ \ | |/ / /
| * | | MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694Marko Mäkelä2017-01-031-47/+1
* | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+46
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-0/+46
| |\ \ \ | | |/ /
| | * | 5.6.33-79.0Sergei Golubchik2016-10-251-0/+46
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-124/+124
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-128/+128
| |\ \ \ | | |/ /
| | * | 5.6.31-77.0Sergei Golubchik2016-08-101-130/+130
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-9/+33
|\ \ \ \ | |/ / /
| * | | MDEV-9276: MySQL Bug #78754: FK definitions missing from SHOW CREATE TABLE in...Jan Lindström2015-12-141-8/+5
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2015-12-131-0/+28
| |\ \ \ | | |/ /
| | * | 5.6.27-76.0Sergei Golubchik2015-12-131-0/+28
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-26/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-10-091-26/+1
| |\ \ \ | | |/ /
| | * | 5.6.26-74.0Sergei Golubchik2015-10-091-26/+1
| | * | move to storage/xtradbSergei Golubchik2015-05-041-0/+1849
| | /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-2/+17
|\ \ \ | |/ /
| * | Merge commit '96badb16afcf' into 10.0Jan Lindström2015-08-031-2/+17
| |\ \ | | |/
| | * XtraDB 5.5.41-37.0Sergei Golubchik2015-02-111-0/+8
| | * Fixed a couple of compiler warnings.Sergey Vojtovich2014-12-191-1/+1
| | * MDEV-7084: innodb index stats inadequate using constant Jan Lindström2014-11-191-2/+10
| | * XtraDB 5.5.39-36.0Sergei Golubchik2014-10-061-1/+38
* | | Merge 10.0 -> 10.1Kristian Nielsen2015-04-201-0/+11
|\ \ \ | |/ /
| * | MDEV-7367: Updating a virtual column corrupts table which crashes serverJan Lindström2015-03-311-0/+11
* | | InnoDB/XtraDB Encryption cleanup.Jan Lindström2015-04-071-3/+1
* | | Push for testing of encryptionMonty2015-02-101-2/+19
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-1/+1
|\ \ \ | |/ /
| * | XtraDB 5.6.22-71.0Sergei Golubchik2015-01-211-1/+1
* | | MDEV-6929: Port Facebook Prefix Index Queries OptimizationJan Lindström2014-11-031-4/+7
* | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-1/+26
|\ \ \ | |/ /
| * | xtradb-5.6.19-67.0Sergei Golubchik2014-08-061-1/+23
| * | MDEV-6470: Restrict number of error messages about persistent statictic table...Jan Lindström2014-07-221-0/+3
* | | MDEV-5834: Merge Kakao Defragmentation implementation to MariaDB 10.1Jan Lindström2014-08-061-1/+13