diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-07-29 17:05:38 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-07-29 17:05:38 +0000 |
| commit | ff0ae68eae0e097e0c2a768553cee8c411a541b2 (patch) | |
| tree | 99789abb721cd868f70e405c2fae20347f822c2a | |
| parent | d083c2490ab4a5df57947167372e00b7ff3967b1 (diff) | |
| parent | b2617cae3fa15c940f4b6c671d8f445ac67d3237 (diff) | |
| download | mariadb-git-ff0ae68eae0e097e0c2a768553cee8c411a541b2.tar.gz | |
Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into bb-10.2-mariarocks
| -rw-r--r-- | storage/rocksdb/rdb_mariadb_port.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/rocksdb/rdb_mariadb_port.h b/storage/rocksdb/rdb_mariadb_port.h index aa15ff8e02f..1661338030f 100644 --- a/storage/rocksdb/rdb_mariadb_port.h +++ b/storage/rocksdb/rdb_mariadb_port.h @@ -7,7 +7,10 @@ #include "my_global.h" /* ulonglong */ #include "atomic_stat.h" + +// These are for split_into_vector: #include <vector> +#include <string> /* The following is copied from storage/innobase/univ.i: */ #ifndef MY_ATTRIBUTE |