diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
| commit | 4c89cff5582e786d1cde40b75c2290c136e64e31 (patch) | |
| tree | 098edebe3e6e97ca234bf8842580851f807cd57a /storage/oqgraph | |
| parent | 4ede2fec4cb7165a469776bfdbf247db86acb297 (diff) | |
| parent | 400a8eb60f832030a04a248e2c96552aa3f44055 (diff) | |
| download | mariadb-git-4c89cff5582e786d1cde40b75c2290c136e64e31.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/graphcore-graph.cc | 1 | ||||
| -rw-r--r-- | storage/oqgraph/graphcore.cc | 1 | ||||
| -rw-r--r-- | storage/oqgraph/oqgraph_shim.h | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/storage/oqgraph/graphcore-graph.cc b/storage/oqgraph/graphcore-graph.cc index 6decce601fe..42366787340 100644 --- a/storage/oqgraph/graphcore-graph.cc +++ b/storage/oqgraph/graphcore-graph.cc @@ -22,6 +22,5 @@ ====================================================================== */ -#include "graphcore-config.h" #include "graphcore-graph.h" diff --git a/storage/oqgraph/graphcore.cc b/storage/oqgraph/graphcore.cc index bf454aa3333..1a7df6147e7 100644 --- a/storage/oqgraph/graphcore.cc +++ b/storage/oqgraph/graphcore.cc @@ -25,7 +25,6 @@ #include <string.h> #include <cstdlib> -#include "graphcore-config.h" #include "graphcore-graph.h" #include <set> diff --git a/storage/oqgraph/oqgraph_shim.h b/storage/oqgraph/oqgraph_shim.h index f24732af4ef..df578c9e4d0 100644 --- a/storage/oqgraph/oqgraph_shim.h +++ b/storage/oqgraph/oqgraph_shim.h @@ -24,8 +24,8 @@ #pragma once -#include "oqgraph_thunk.h" #include "oqgraph_judy.h" +#include "oqgraph_thunk.h" #define BOOST_NO_HASH 1 #define BOOST_NO_SLIST 1 |