summaryrefslogtreecommitdiff
path: root/storage/innobase/include/univ.i
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2020-01-201-1/+1
|\
| * Merge 10.2 into 10.3Marko Mäkelä2020-01-181-1/+1
| |\
| | * MDEV-21499 Merge new release of InnoDB 5.7.29 to 10.2Marko Mäkelä2020-01-171-2/+2
| | * MDEV-20850 Merge new release of InnoDB 5.7.28 to 10.2Marko Mäkelä2019-10-171-1/+1
| | * MDEV-20133 Merge new release of InnoDB 5.7.27 to 10.2Marko Mäkelä2019-07-251-1/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2019-10-101-1/+0
|\ \ \ | |/ /
| * | Cleanup mman.h includesSergey Vojtovich2019-10-021-1/+0
* | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-191-1/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
| |\ \ | | |/
| | * Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| | |\
| | | * Update FSF addressVicențiu Ciorbaru2019-05-111-1/+1
| | | * MDEV-19331 Merge new release of InnoDB 5.6.44 to 10.1Marko Mäkelä2019-04-251-1/+1
| | | * cmake: re-enable -Werror in the maintainer modeSergei Golubchik2019-03-271-2/+0
| | | * Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+1
| | | |\
| | | | * Version fix after mergeOleksandr Byelkin2019-01-281-1/+1
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-05-051-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-04-291-2/+0
| |\ \ \ \ | | |/ / /
| | * | | MDEV-14130 InnoDB messages should not refer to the MySQL 5.7 manualMarko Mäkelä2019-04-291-4/+0
| | * | | MDEV-19342 Merge new release of InnoDB 5.7.26 to 10.2Marko Mäkelä2019-04-261-1/+1
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-04-251-4/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-04-251-4/+1
| |\ \ \ \ | | |/ / /
| | * | | Remove IBUF_COUNT_DEBUGMarko Mäkelä2019-04-191-4/+1
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-01-241-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-01-241-4/+0
| |\ \ \ \ | | |/ / /
| | * | | Update the InnoDB version numberMarko Mäkelä2019-01-231-1/+1
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-01-171-6/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-01-171-6/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2019-01-171-6/+5
| | |\ \ \ | | | |/ /
| | | * | Merge 10.0 into 10.1Marko Mäkelä2019-01-171-6/+5
| | | |\ \ | | | | |/
| | | | * MDEV-17797 Add ASAN poisoning for mem_heap_tMarko Mäkelä2019-01-151-6/+5
| | | * | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-1/+1
| | | |\ \ | | | | |/
| | | | * MDEV-17533 Merge new release of InnoDB 5.6.42 to 10.0Marko Mäkelä2018-10-251-1/+1
* | | | | MDEV-17441 - InnoDB transition to C++11 atomicsSergey Vojtovich2018-12-271-0/+1
|/ / / /
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-17536 Merge new release of InnoDB 5.7.24 to 10.2Marko Mäkelä2018-10-251-1/+1
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-10-191-3/+0
|\ \ \ \ | |/ / /
| * | | Remove unused TIMETPFMarko Mäkelä2018-10-191-3/+0
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-1/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-1/+3
| |\ \ \ | | |/ /
| | * | compiler warnings (clang 4.0.1 on i386)Sergei Golubchik2018-09-041-1/+2
| | * | Merge branch '10.0' into 10.1Oleksandr Byelkin2018-07-311-1/+1
| | |\ \ | | | |/
| | | * Merge InnoDB MySQL 5.6.41 to 10.0Marko Mäkelä2018-07-301-1/+1
| | * | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-1/+1
| | |\ \ | | | |/
| | | * Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2018-04-261-1/+1
| | | |\
* | | | \ Merge 10.2 into 10.3Marko Mäkelä2018-08-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-16850 Merge new release of InnoDB 5.7.23 to 10.2Marko Mäkelä2018-08-031-1/+1
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-05-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-16142: Update the InnoDB version number to 5.7.22Marko Mäkelä2018-05-151-1/+1
* | | | | MDEV-16172 Remove InnoDB 5.7 version number from MariaDB 10.3 onwardsMarko Mäkelä2018-05-151-7/+5
* | | | | Use compile_time_assert() in InnoDBMarko Mäkelä2018-04-301-1/+1