Merge #18 (uploaded with msyql blob in blobstore)

config/blobs.yml

@@ -27,3 +27,7 @@ mysql/client-5.1.62-rel13.3-435-Linux-x86_64.tar.gz:
   object_id: 6adad680-4e5d-4e0b-b419-09a951455928
   sha: 6e5a17195831688a5f14f20aa5d9cd5d5f4164db
   size: 4105211
+mysqlclient/mysql-connector-c-6.1.6-src.tar.gz:
+  object_id: e640b8d3-ae0f-4103-8d44-c0f9644d7c41
+  sha: 2444586365c2c58e7ca2397d4617e5fe19f9f246
+  size: 3475044

packages/admin_ui/packaging

@@ -8,7 +8,7 @@ libpq_dir=/var/vcap/packages/libpq
 cp -a ${BOSH_COMPILE_TARGET}/{admin_ui,vcap-common} ${BOSH_INSTALL_TARGET}
 
 cd ${BOSH_INSTALL_TARGET}/admin_ui
-$bundle_cmd config build.mysql2 --with-mysql-dir=$mysqlclient_dir --with-mysql-include=$mysqlclient_dir/include/mysql
+$bundle_cmd config build.mysql2 --with-mysql-config=$mysqlclient_dir/bin/mysql_config
 $bundle_cmd config build.pg --with-pg-lib=$libpq_dir/lib --with-pg-include=$libpq_dir/include
 $bundle_cmd config build.sequel_pg --with-pg-lib=$libpq_dir/lib --with-pg-include=$libpq_dir/include
 $bundle_cmd config build.sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite

packages/mysqlclient/packaging

@@ -1,10 +1,14 @@
-set -e -x
+set -e
 
-VERSION=5.1.62-rel13.3-435-Linux-x86_64
-# Percona binary Linux build - minor change
-tar zxvf mysql/client-$VERSION.tar.gz
+MYSQL_CLIENT_VERSION=6.1.6
 
-cd client-$VERSION
-for x in bin include lib; do
-  cp -a ${x} ${BOSH_INSTALL_TARGET}
-done
+tar xzf mysqlclient/mysql-connector-c-${MYSQL_CLIENT_VERSION}-src.tar.gz
+(
+  set -e
+  cd mysql-connector-c-${MYSQL_CLIENT_VERSION}-src
+  mkdir bld
+  cd bld
+  cmake .. -DCMAKE_INSTALL_PREFIX=${BOSH_INSTALL_TARGET}
+  make
+  make install
+)

packages/mysqlclient/spec

@@ -1,4 +1,5 @@
 ---
 name: mysqlclient
+
 files:
-- mysql/client-5.1.62-rel13.3-435-Linux-x86_64.tar.gz
+- mysqlclient/**/*