Post-push fixups for WL#5349

mysql-test/suite/perfschema/t/no_threads-master.opt:
  Innodb will start multiple threads, which is
  not compatible with --one-thread.   Disable
  innodb to be able to run the test case.

cmake/create_initial_db.cmake.in

@@ -57,6 +57,7 @@ SET(BOOTSTRAP_COMMAND
   --lc-messages-dir=${CMAKE_CURRENT_BINARY_DIR}/share
   --basedir=.
   --datadir=.
+  --default-storage-engine=MyISAM
   --loose-skip-innodb
   --loose-skip-ndbcluster
   --max_allowed_packet=8M
@@ -79,4 +80,4 @@ EXECUTE_PROCESS (
 IF(NOT RESULT EQUAL 0)
   MESSAGE(FATAL_ERROR "Could not create initial database \n ${OUT} \n ${ERR}")
 ENDIF()
- 
+ 

mysql-test/suite/perfschema/t/no_threads-master.opt

@@ -1 +1 @@
---one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10
+--one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb