summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler/i_s.cc
Commit message (Expand)AuthorAgeFilesLines
* Remove XtraDBMarko Mäkelä2017-06-211-9647/+0
* Merge 10.0 into 10.1Marko Mäkelä2017-05-191-145/+142
|\
| * MDEV-12188 information schema - errors populating fail to free memory, unlock...Marko Mäkelä2017-05-151-143/+142
* | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothingJan Lindström2017-03-141-35/+70
* | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-23/+1
|\ \ | |/
| * Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-03-051-23/+1
| |\
| | * 5.6.35-80.0Vicențiu Ciorbaru2017-03-041-23/+1
* | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+2
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-0/+2
| |\ \ | | |/
| | * 5.6.33-79.0Sergei Golubchik2016-10-251-0/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-2/+37
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-09-271-2/+37
| |\ \ | | |/
| | * 5.6.32-78.1Sergei Golubchik2016-09-271-2/+37
* | | update plugin maturitiesSergei Golubchik2016-09-051-34/+34
* | | update plugins' maturity levelsSergei Golubchik2016-03-181-34/+34
* | | MDEV-9640: Add used key_id to INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTIONJan Lindström2016-03-181-1/+12
* | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-4/+7
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-06-161-4/+7
| |\ \ | | |/
| | * 5.6.24-72.2Sergei Golubchik2015-06-161-4/+7
| | * move to storage/xtradbSergei Golubchik2015-05-041-0/+8557
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-05-081-2/+5
| |\
| | * Fix compiler error if compiler does not support c99 styleJan Lindström2015-05-071-2/+5
| | * c99 style for assigning structure membersDaniel Black2015-04-251-1/+1
| | * XtraDB 5.5.39-36.0Sergei Golubchik2014-10-061-0/+25
| | * MDEV-4791: Assertion range_end >= range_start fails in log0online.c Jan Lindström2014-05-091-25/+34
| | * Percona-Server-5.5.35-rel33.0.tar.gzSergei Golubchik2014-01-221-0/+4
* | | MDEV-7472: Implementation of user statements for handling the xtradb changed ...Jan Lindström2015-06-231-0/+125
* | | MDEV-8046: Server crashes in pfs_mutex_enter_func on select from I_S.INNODB_T...Jan Lindström2015-05-061-0/+2
* | | Merge branch 'bb-10.1-jan-encryption' into bb-10.1-sergSergei Golubchik2015-04-091-0/+2
|\ \ \
| * | | InnoDB/XtraDB Encryption cleanup.Jan Lindström2015-04-071-0/+2
* | | | update XtraDB/InnoDB plugin maturity to match the serverSergei Golubchik2015-04-091-33/+33
|/ / /
* | | InnoDB cleanup. Remove empty statements i.e. extra ; characters.Jan Lindström2015-03-161-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-5/+0
|\ \ \ | |/ /
| * | xtradb 5.6.22-72.0Sergei Golubchik2015-02-181-5/+0
* | | MDEV-7109: Add support for INFORMATION_SCHEMA.INNODB_SEMAPHORE_WAITSJan Lindström2015-02-211-41/+509
* | | Push for testing of encryptionMonty2015-02-101-4/+586
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-0/+1
|\ \ \ | |/ /
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
* | | Make sure that information schema knows also page compressed pageJan Lindström2014-10-201-0/+1
* | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-0/+9
|\ \ \ | |/ /
| * | XtraDB 5.6.20-68.0Sergei Golubchik2014-09-111-0/+9
* | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-1/+1
|/ /
* | MDEV-4791: Assertion range_end >= range_start fails in log0online.cJan Lindström2014-05-091-25/+34
* | xtradb 5.6.17-65.0Sergei Golubchik2014-05-071-94/+145
* | Percona-Server-5.6.15-rel63.0.tar.gz mergeSergei Golubchik2014-02-261-34/+191
* | fix xtradb I_S tables to loadSergei Golubchik2013-12-221-6/+6
* | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-1965/+2664
|/
* Percona-Server-5.5.34-rel32.0 mergeSergei Golubchik2013-11-191-0/+2
* fix xtradb to compile in both debug and optimized buildsSergei Golubchik2013-09-071-0/+4
* Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-24/+41