4 files changed, 32 insertions, 6 deletions
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc
index b168a767d7c..ebadb5077ae 100644
--- a/mysql-test/include/index_merge1.inc
+++ b/mysql-test/include/index_merge1.inc
@@ -150,12 +150,22 @@ explain select * from t0 where
     (((key3 <7 and key7 < 6) or key5 < 2) and (key5 < 5 or key6 < 6));
 
 explain select * from t0 where
-    ((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+    ((key3 < 4 or key5 < 4) and (key1 < 4 or key2 < 4))
   or
     ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 
 explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
-    ((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+    ((key3 < 4 or key5 < 4) and (key1 < 4 or key2 < 4))
+  or
+    ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
+
+explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
+    ((key3 < 5 or key5 < 4) and (key1 < 4 or key2 < 4))
+  or
+    ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
+
+explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
+    ((key3 < 10 or key5 < 4) and (key1 < 4 or key2 < 4))
   or
     ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 
diff --git a/mysql-test/include/is_embedded.inc b/mysql-test/include/is_embedded.inc
index b20f21953f0..a440406edd4 100644
--- a/mysql-test/include/is_embedded.inc
+++ b/mysql-test/include/is_embedded.inc
@@ -1,5 +1,7 @@
+#
+# Check if the current used server is an embedded server#
+#
 if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-
diff --git a/mysql-test/include/is_embedded_no_privileges.inc b/mysql-test/include/is_embedded_no_privileges.inc
new file mode 100644
index 00000000000..364c697c5a8
--- /dev/null
+++ b/mysql-test/include/is_embedded_no_privileges.inc
@@ -0,0 +1,16 @@
+#
+# Test that we do not have an embedded server compiled with privileges.
+# This is not a regular setup, but we are running this in buildbot for
+# testing of embedded + privileges.
+# Some funcs_1 test cannot handle this combination, which is why we have this
+# file to disable them
+#
+
+--source include/is_embedded.inc
+
+let priv=`SELECT privileges FROM information_schema.columns limit 1`;
+
+if (`SELECT "$priv" <> ""`)
+{
+   --skip Embedded server is compiled with privileges; Test disabled.
+}
diff --git a/mysql-test/include/not_windows_embedded.inc b/mysql-test/include/not_windows_embedded.inc
index 46f5e0ccfce..50ff0f80c7d 100644
--- a/mysql-test/include/not_windows_embedded.inc
+++ b/mysql-test/include/not_windows_embedded.inc
@@ -1,10 +1,8 @@
 let $is_win = `select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows")`;
-let $is_embedded = `select version() like '%embedded%'`;
 #echo is_win: $is_win;
-#echo is_embedded: $is_embedded;
 if ($is_win)
 {
-  if ($is_embedded)
+  if(!$MYSQL_EMBEDDED)
   {
     skip Not supported with embedded on windows;
   }