Merge changes from MySQL AB to mysql-test directives.

The results are not affected.

mysql-test/innodb-lock.test

 -- source include/have_innodb.inc
-# Can't test this with embedded server
--- source include/not_embedded.inc
 
 #
 # Check and select innodb lock type

mysql-test/innodb.test

@@ -11,6 +11,7 @@
 #                                                                     #
 #######################################################################
 
+-- source include/not_embedded.inc
 -- source include/have_innodb.inc
 
 #
@@ -1475,7 +1476,7 @@ INSERT INTO t1 (id) VALUES (NULL);
 SELECT * FROM t1;
 DROP TABLE t2, t1;
 
--- Test that foreign keys in temporary tables are not accepted (bug #12084)
+# Test that foreign keys in temporary tables are not accepted (bug #12084)
 CREATE TABLE t1
 (
  id INT PRIMARY KEY