Add a new webscale dependency

Summary: Test Plan: Reviewers: CC: Task ID: # Blame Rev:
hhvm · Oct 22, 2015 · 9f6ae51 · 9f6ae51
1 parent 695d044
commit 9f6ae51
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,13 +13,12 @@
 [submodule "re2/src"]
 	path = re2/src
 	url = https://github.com/google/re2.git
-[submodule "webscalesqlclient/webscalesql-5.6"]
-	path = webscalesqlclient/webscalesql-5.6
-	url = https://github.com/webscalesql/webscalesql-5.6.git
-  ignore = dirty
 [submodule "squangle/squangle"]
 	path = squangle/src
 	url = https://github.com/facebook/squangle.git
 [submodule "wangle/src"]
 	path = wangle/src
 	url = https://github.com/facebook/wangle
+[submodule "webscalesqlclient/mysql-5.6"]
+	path = webscalesqlclient/mysql-5.6
+	url = https://github.com/facebook/mysql-5.6.git
diff --git a/webscalesqlclient/CMakeLists.txt b/webscalesqlclient/CMakeLists.txt
@@ -3,7 +3,7 @@ include(ExternalProject)
 SET(CMAKE_C_FLAGS "-Wno-maybe-uninitialized ${CMAKE_C_FLAGS}")
 ExternalProject_Add(
   webscalesqlclient
-  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/webscalesql-5.6/
+  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/
   CMAKE_ARGS
   -DWITHOUT_SERVER=TRUE
   -DDISABLE_SHARED=TRUE

diff --git a/webscalesqlclient/mysql-5.6 b/webscalesqlclient/mysql-5.6
diff --git a/webscalesqlclient/src b/webscalesqlclient/src
@@ -1 +1 @@
-webscalesql-5.6/
+mysql-5.6/
diff --git a/webscalesqlclient/webscalesql-5.6 b/webscalesqlclient/webscalesql-5.6