diff --git a/mysql-test/t/lowercase_table_grant.test b/mysql-test/t/lowercase_table_grant.test
index 5ac35c81c21..3d6adb477a3 100644
--- a/mysql-test/t/lowercase_table_grant.test
+++ b/mysql-test/t/lowercase_table_grant.test
@@ -1,3 +1,6 @@
+# Don't test with embedded server
+-- source include/not_embedded.inc
+
 # Test of grants when lower_case_table_names is on
 use mysql;
 
diff --git a/mysql-test/t/skip_name_resolve.test b/mysql-test/t/skip_name_resolve.test
index 68dcf329427..b669579acbf 100644
--- a/mysql-test/t/skip_name_resolve.test
+++ b/mysql-test/t/skip_name_resolve.test
@@ -1,3 +1,6 @@
+# Can't be tested with embedded server
+-- source include/not_embedded.inc
+
 # Bug #8471: IP address with mask fail when skip-name-resolve is on
 GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255';
 SHOW GRANTS FOR mysqltest_1@'127.0.0.1/255.255.255.255';
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 86544f72316..49110e02113 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1546,6 +1546,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
       }
       else
 	thd->query_rest.copy(packet, length, thd->query_rest.charset());
+
+      thd->server_status&= ~ (SERVER_QUERY_NO_INDEX_USED |
+                              SERVER_QUERY_NO_GOOD_INDEX_USED);
       break;
 #endif /*EMBEDDED_LIBRARY*/
     }