summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/ha_prototypes.h
Commit message (Expand)AuthorAgeFilesLines
* Remove XtraDBMarko Mäkelä2017-06-211-692/+0
* Merge 10.1 into 10.2Marko Mäkelä2017-05-221-1/+2
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-05-191-1/+2
| |\
| | * Fix some __attribute__((nonnull)) misuseMarko Mäkelä2017-05-181-1/+2
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-0/+7
|\ \ \ | |/ /
| * | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-231-0/+7
* | | Merge branch '10.2' into bb-10.2-janSergei Golubchik2016-09-191-11/+11
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-11/+11
| |\ \ | | |/
| | * Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-11/+11
| | |\
| | | * 5.6.31-77.0Sergei Golubchik2016-08-101-11/+11
* | | | misc after-merge changes:Sergei Golubchik2016-09-101-0/+1
|/ / /
* | | MDEV-9618 solaris sparc build fails on 10.1.Alexey Botchkov2016-06-271-2/+4
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-1/+10
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-261-1/+10
| |\ \ | | |/
| | * 5.6.29-76.2Sergei Golubchik2016-04-261-1/+10
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-0/+14
|\ \ \ | |/ /
| * | Use C++ linkage.Jan Lindström2016-02-041-1/+0
| * | Fix function visibility as it is used on row0mysql.c in Windows.Jan Lindström2016-02-031-0/+14
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-0/+10
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2015-12-131-0/+10
| |\ \ | | |/
| | * 5.6.27-76.0Sergei Golubchik2015-12-131-0/+10
* | | MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least o...Jan Lindström2015-09-041-1/+9
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-2/+18
|\ \ \ | |/ /
| * | Merge branch 'bb-10.0-jan' into 10.0Sergei Golubchik2015-08-051-0/+9
| |\ \
| | * \ Merge commit '96badb16afcf' into 10.0Jan Lindström2015-08-031-0/+9
| | |\ \
| | | * | MDEV-8524: Improve error messaging when there is duplicate key or foreign key...Jan Lindström2015-07-311-0/+9
| * | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-08-031-2/+9
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | 5.6.25-73.1Sergei Golubchik2015-08-011-2/+9
* | | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+1
|\ \ \ \ | |/ / /
| * | | XtraDB-5.6.23-72.1Sergei Golubchik2015-05-051-1/+1
| |\ \ \ | | |/ /
| | * | 5.6.23-72.1Sergei Golubchik2015-05-041-1/+1
| | * | move to storage/xtradbSergei Golubchik2015-05-041-0/+613
| | /
* | | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-011-8/+0
* | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+17
|/ /
* | MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-10/+0
* | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-33/+290
* | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-2/+2
|\ \ | |/
| * Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-2/+2
* | 5.5 mergeSergei Golubchik2013-07-171-1/+32
|\ \ | |/
| * merge Percona-Server-5.5.32-rel31.0.tar.gzSergei Golubchik2013-07-161-1/+32
* | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-1/+1
|\ \ | |/
| * XtraDB from Percona-Server-5.5.28-rel29.1Sergei Golubchik2012-11-221-1/+1
* | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-141-0/+11
|/
* XtraDB from Percona-Server-5.5.27-rel28.1Sergei Golubchik2012-09-051-0/+11
* 5.3 mergeSergei Golubchik2012-02-211-2/+1
|\
| * fix forSergei Golubchik2012-02-201-1/+0
| * Remove engine-specific (but identical) icp callbacks. create one reusableSergei Golubchik2012-02-171-1/+1
* | Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5unknown2011-12-151-0/+1
* | 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+9
|\ \ | |/
| * Downported InnoDB support of Index Condition Pushdown from MySQL-5.6 code line.Igor Babaev2011-05-251-0/+9