summaryrefslogtreecommitdiff
path: root/storage/innobase/include/ha_prototypes.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2017-05-191-12/+0
|\
| * Fix some __attribute__((nonnull)) misuseMarko Mäkelä2017-05-181-12/+0
* | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-231-0/+7
* | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-11/+11
|\ \ | |/
| * Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-211-11/+11
| |\
| | * 5.6.31Sergei Golubchik2016-06-211-11/+11
* | | MDEV-9618 solaris sparc build fails on 10.1.Alexey Botchkov2016-06-271-2/+4
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-1/+26
|\ \ \ | |/ /
| * | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-02-161-1/+10
| |\ \ | | |/
| | * 5.6.29Sergei Golubchik2016-02-161-1/+10
| | * move to storage/innobaseSergei Golubchik2015-05-041-0/+596
| * 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/+15
* | 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-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 '10.0' into 10.1Sergei Golubchik2015-03-071-1/+1
|\ \ \ | |/ /
| * | innodb 5.6.23Sergei Golubchik2015-02-181-1/+1
* | | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-011-10/+3
* | | 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
* | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-3/+34
* | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-1/+1
* | 10.0-base mergeSergei Golubchik2013-12-161-0/+10
|\ \
| * \ 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-2/+2
| |\ \ | | |/
| | * Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERSMurthy Narkedimilli2013-06-101-2/+2
| | * Merge from mysql-5.1 to mysql-5.5Annamalai Gurusami2013-05-061-1/+21
| | |\
| | | * Bug #16722314 FOREIGN KEY ID MODIFIED DURING EXPORTAnnamalai Gurusami2013-05-061-3/+12
| * | | 5.5 mergeSergei Golubchik2013-07-171-1/+21
| |\ \ \
| | * | | Bug #16722314 FOREIGN KEY ID MODIFIED DURING EXPORTAnnamalai Gurusami2013-05-061-1/+21
| | |/ /
| * | | 5.5 mergeSergei Golubchik2013-06-061-0/+11
| |\ \ \ | | |/ /
| | * | Merge from mysql-5.1 to mysql-5.5.Annamalai Gurusami2013-02-121-0/+11
| | |\ \ | | | |/
| | | * Bug #11753153 INNODB GENERATES SYMBOLS THAT ARE TOO LONG, INVALID DDLAnnamalai Gurusami2013-02-121-0/+22
* | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-28/+188
* | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-0/+11
|\ \ \ \ | |/ / /
| * | | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-141-0/+11
| |/ /
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-10/+128
|/ /
* | Bug#60309 - Bug#12356829: MYSQL 5.5.9 FOR MAC OSX HAS BUG WITH FOREIGN KEY C...unknown2011-04-261-0/+11
* | Fix Bug #11765975 __FILE__ macros expanded to full path instead of relativeJimmy Yang2011-02-251-0/+9
* | Fix bug #53496 Use Lock_time in slow query log output for InnoDB rowJimmy Yang2010-08-171-0/+8
* | Merge from mysql-5.1-innodb:Marko Mäkelä2010-05-141-1/+11
* | Import branches/innodb+ from SVN on top of storage/innobase.Vasil Dimov2010-04-121-1/+1
* | manual merge mysql-5.1-bugteam --> mysql-trunk-mergeGleb Shchepa2009-12-041-22/+0
|\ \ | |/
| * Applying InnoDB snapshot 5.1-ss6242, part 1. Fixes BUG#32430Satya B2009-11-301-11/+14
* | Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-071-0/+283
* | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-76/+0
|/
* Apply InnoDB snapshot innodb-5.1-ss2637, part 1. FixesTimothy Smith2008-12-141-0/+9
* Apply snapshot innodb-5.1-ss1989unknown2007-11-061-0/+16
* Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569.unknown2007-07-101-0/+29