diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 10:55:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 11:05:46 +0200 |
| commit | b37424673014c3350d51b1b2cfd45c76a7cdb90c (patch) | |
| tree | 501a9c12c0e572f1947bc2849ebe42a4a6baa9fe /storage/innobase/include/srv0srv.h | |
| parent | 3a393f8c8422f52934f54f000068a13764a7d599 (diff) | |
| parent | 0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d (diff) | |
| download | mariadb-git-b37424673014c3350d51b1b2cfd45c76a7cdb90c.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/srv0srv.h')
| -rw-r--r-- | storage/innobase/include/srv0srv.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index be448696b1b..451959a5ab8 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -42,20 +42,17 @@ Created 10/10/1995 Heikki Tuuri #ifndef srv0srv_h #define srv0srv_h -#include "univ.i" - -#include "mysql/psi/mysql_stage.h" -#include "mysql/psi/psi.h" - #include "log0log.h" #include "os0event.h" #include "que0types.h" #include "trx0types.h" #include "srv0conc.h" #include "buf0checksum.h" -#include "ut0counter.h" #include "fil0fil.h" +#include "mysql/psi/mysql_stage.h" +#include "mysql/psi/psi.h" + /** Global counters used inside InnoDB. */ struct srv_stats_t { |