diff --git a/extra/Makefile.am b/extra/Makefile.am
index a2b4dce374a..56fed856637 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -29,8 +29,8 @@ SUBDIRS=
 DIST_SUBDIRS=           yassl
 
 # This will build mysqld_error.h and sql_state.h
-$(top_builddir)/include/mysqld_error.h: comp_err
-	$(top_builddir)/extra/comp_err \
+$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
+	$(top_builddir)/extra/comp_err$(EXEEXT) \
 	--charset=$(top_srcdir)/sql/share/charsets \
 	--out-dir=$(top_builddir)/sql/share/ \
 	--header_file=$(top_builddir)/include/mysqld_error.h \
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 5afb1549973..e328b358db5 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -18,3 +18,4 @@ func_group      : Bug #15448
 func_math       : Bug #15448
 group_min_max   : Bug #15448 
 mysqlslap       : Bug #15483
+subselect       : Bug #15706
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 6dbffdc9778..1892e8b4a46 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -56,12 +56,18 @@ if test -z "$basedir"
 then
   basedir=@prefix@
   bindir=@bindir@
-  datadir=@localstatedir@
+  if test -z "$datadir"
+  then
+    datadir=@localstatedir@
+  fi
   sbindir=@sbindir@
   libexecdir=@libexecdir@
 else
   bindir="$basedir/bin"
-  datadir="$basedir/data"
+  if test -z "$datadir"
+  then
+    datadir="$basedir/data"
+  fi
   sbindir="$basedir/sbin"
   libexecdir="$basedir/libexec"
 fi