Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into bb-10.2-mariarocks

ff0ae68e · Sergei Petrunia · d083c249 · b2617cae · ff0ae68e
Commit ff0ae68e authored Jul 29, 2017 by Sergei Petrunia
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

storage/rocksdb/rdb_mariadb_port.h storage/rocksdb/rdb_mariadb_port.h +3 -0

No files found.
--- 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