Fix innodb-system-table-view for --embedded

Author: dr-m

mysql-test/suite/innodb/include/show_i_s_tablespaces.inc

@@ -4,7 +4,7 @@
 --echo === information_schema.innodb_sys_tablespaces and innodb_sys_datafiles ===
 --disable_query_log
 --replace_regex  /#P#/#p#/  /#SP#/#sp#/
---replace_result ./ MYSQLD_DATADIR/  $MYSQLD_DATADIR/ MYSQLD_DATADIR/  $MYSQLD_DATADIR MYSQLD_DATADIR/  $MYSQL_TMP_DIR MYSQL_TMP_DIR  $INNODB_PAGE_SIZE DEFAULT
+--replace_result ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR $MYSQL_TMP_DIR MYSQL_TMP_DIR $INNODB_PAGE_SIZE DEFAULT
 SELECT s.name 'Space_Name',
 	s.page_size 'Page_Size',
 	s.zip_page_size 'Zip_Size',

mysql-test/suite/innodb/t/innodb-system-table-view.test

@@ -4,11 +4,8 @@
 
 --source include/innodb_page_size_small.inc
 
---disable_query_log
-SET default_storage_engine=InnoDB;
 LET $MYSQLD_DATADIR = `select @@datadir`;
 LET $INNODB_PAGE_SIZE = `select @@innodb_page_size`;
---enable_query_log
 
 # The IDs of mysql.innodb_table_stats and mysql.innodb_index_stats may
 # vary depending on whether the tables have been rebuilt