diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
| commit | fd58bb71e22196c3c5e8d20b92bce6f343f1dea1 (patch) | |
| tree | 88b34c77a20d9e816edce51e9dcff47f6de526c8 /storage/innobase/que | |
| parent | 37d6d3b661315617953f1a8c5d53a2cb6558992e (diff) | |
| parent | e669e705a1a7d2bbdd42734cb9fc8349a5f2f118 (diff) | |
| download | mariadb-git-fd58bb71e22196c3c5e8d20b92bce6f343f1dea1.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/que')
| -rw-r--r-- | storage/innobase/que/que0que.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/innobase/que/que0que.cc b/storage/innobase/que/que0que.cc index ebcd7bd450e..ef40c3479a0 100644 --- a/storage/innobase/que/que0que.cc +++ b/storage/innobase/que/que0que.cc @@ -24,8 +24,6 @@ Query graph Created 5/27/1996 Heikki Tuuri *******************************************************/ -#include "ha_prototypes.h" - #include "que0que.h" #include "trx0trx.h" #include "trx0roll.h" @@ -37,9 +35,6 @@ Created 5/27/1996 Heikki Tuuri #include "dict0crea.h" #include "log0log.h" #include "eval0proc.h" -#include "lock0lock.h" -#include "eval0eval.h" -#include "pars0types.h" #define QUE_MAX_LOOPS_WITHOUT_CHECK 16 |