diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 09:23:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 09:38:56 +0200 |
| commit | 0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d (patch) | |
| tree | 392d3fdcfe227d603fdcc96793506d4fee1867ca /storage/innobase/trx | |
| parent | 35184902db9291ff784742a33cb9019993dfa61c (diff) | |
| parent | 33fdb443ea79207113cf43dbd9469f7ae698b084 (diff) | |
| download | mariadb-git-0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d.tar.gz | |
Merge 10.2 into 10.3
Also, related to MDEV-15522, MDEV-17304, MDEV-17835,
remove the Galera xtrabackup tests, because xtrabackup never worked
with MariaDB Server 10.3 due to InnoDB redo log format changes.
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0i_s.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc index 180cbb26459..965faaba478 100644 --- a/storage/innobase/trx/trx0i_s.cc +++ b/storage/innobase/trx/trx0i_s.cc @@ -29,13 +29,6 @@ table cache" for later retrieval. Created July 17, 2007 Vasil Dimov *******************************************************/ -/* Found during the build of 5.5.3 on Linux 2.4 and early 2.6 kernels: - The includes "univ.i" -> "my_global.h" cause a different path - to be taken further down with pthread functions and types, - so they must come first. - From the symptoms, this is related to bug#46587 in the MySQL bug DB. -*/ - #include "trx0i_s.h" #include "buf0buf.h" #include "dict0dict.h" |