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

…b-10.2-mariarocks
MariaDB · Jul 29, 2017 · ff0ae68 · ff0ae68
2 parents d083c24 + b2617ca
commit ff0ae68
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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