Remember MYSQL_FLAVOR in bootstrap.sh and restore it in dev.env.

bootstrap.sh

@@ -97,6 +97,10 @@ else
   esac
 fi
 
+# save the flavor that was used in bootstrap, so it can be restored
+# every time dev.env is sourced.
+echo "$MYSQL_FLAVOR" > $VT_MYSQL_ROOT/VTFLAVOR
+
 # generate pkg-config, so go can use mysql C client
 if [ ! -x $VT_MYSQL_ROOT/bin/mysql_config ]; then
   echo "cannot execute $VT_MYSQL_ROOT/bin/mysql_config, exiting" 1>&2

dev.env

@@ -70,6 +70,11 @@ if [ "$VT_MYSQL_ROOT" == "" ]; then
   fi
 fi 
 
+# restore MYSQL_FLAVOR, saved by bootstrap.sh
+if [ -r $VT_MYSQL_ROOT/VTFLAVOR ]; then
+  export MYSQL_FLAVOR=`cat $VT_MYSQL_ROOT/VTFLAVOR`
+fi
+
 # mysql cgo library config
 case "$MYSQL_FLAVOR" in
   "MariaDB")