after-merge fixes

in innobase: compilation error on windows
other changes: perfschema merge followup

mysql-test/include/no_protocol.inc

+# The file with expected results fits only to a run without
+# ps-protocol/sp-protocol/cursor-protocol/view-protocol.
+if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
+            + $VIEW_PROTOCOL > 0`)
+{
+   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
+}
+

mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test

@@ -25,10 +25,6 @@ let $fixed_bug_30395= 0;
 
 # The file with expected results fits only to a run without
 # ps-protocol/sp-protocol/cursor-protocol/view-protocol.
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
-            + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
+--source include/no_protocol.inc
 
 --source suite/funcs_1/datadict/processlist_priv.inc

mysql-test/suite/funcs_1/t/processlist_val_no_prot.test

@@ -20,10 +20,6 @@
 
 # The file with expected results fits only to a run without
 # ps-protocol/sp-protocol/cursor-protocol/view-protocol.
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
-            + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
+--source include/no_protocol.inc
 
 --source suite/funcs_1/datadict/processlist_val.inc

mysql-test/suite/stress/t/ddl_archive.test

@@ -12,11 +12,8 @@
 --source include/have_archive.inc
 let $engine_type= ARCHIVE;
 
+--source include/no_protocol.inc
 
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
 let $run= `SELECT '$BIG_TEST' = '1'`;
 if ($run)
 {

mysql-test/suite/stress/t/ddl_csv.test

@@ -12,11 +12,8 @@
 --source include/have_csv.inc
 let $engine_type= CSV;
 
+--source include/no_protocol.inc
 
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
 let $run= `SELECT '$BIG_TEST' = '1'`;
 if ($run)
 {

mysql-test/suite/stress/t/ddl_innodb.test

@@ -12,11 +12,8 @@
 --source include/have_innodb.inc
 let $engine_type= InnoDB;
 
+--source include/no_protocol.inc
 
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
 let $run= `SELECT '$BIG_TEST' = '1'`;
 if ($run)
 {

mysql-test/suite/stress/t/ddl_memory.test

@@ -11,11 +11,8 @@
 # Storage engine to be used in CREATE TABLE
 let $engine_type= MEMORY;
 
+--source include/no_protocol.inc
 
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
 let $run= `SELECT '$BIG_TEST' = '1'`;
 if ($run)
 {

mysql-test/suite/stress/t/ddl_myisam.test

@@ -11,11 +11,8 @@
 # Storage engine to be used in CREATE TABLE
 let $engine_type= MyISAM;
 
+--source include/no_protocol.inc
 
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
 let $run= `SELECT '$BIG_TEST' = '1'`;
 if ($run)
 {

mysql-test/t/partition_innodb.test

-if (`select plugin_auth_version <= "5.6.24" from information_schema.plugins where plugin_name='innodb'`)
+if (`select plugin_auth_version < "5.6.25" from information_schema.plugins where plugin_name='innodb'`)
 {
   --skip Not fixed in InnoDB as of 5.6.24 or earlier
 }

mysql-test/t/query_cache_ps_no_prot.test

@@ -16,12 +16,7 @@ let collation=utf8_unicode_ci;
 --source include/have_collation.inc
 
 # The file with expected results fits only to a run without
-# ps-protocol/sp-protocol/cursor-protocol/view-protocol.
-if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
-            + $VIEW_PROTOCOL > 0`)
-{
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
-}
+--source include/no_protocol.inc
 
 # The main testing script
 --source include/query_cache_sql_prepare.inc

sql/mysqld.cc

@@ -5557,6 +5557,8 @@ int mysqld_main(int argc, char **argv)
   mysql_cond_signal(&COND_server_started);
   mysql_mutex_unlock(&LOCK_server_started);
 
+  MYSQL_SET_STAGE(0 ,__FILE__, __LINE__);
+
 #if defined(_WIN32) || defined(HAVE_SMEM)
   handle_connections_methods();
 #else

sql/sql_table.cc

@@ -1672,6 +1672,7 @@ void execute_ddl_log_recovery()
   (void) mysql_file_delete(key_file_global_ddl_log, file_name, MYF(0));
   global_ddl_log.recovery_phase= FALSE;
   mysql_mutex_unlock(&LOCK_gdl);
+  thd->reset_query();
   delete thd;
   /* Remember that we don't have a THD */
   set_current_thd(0);

storage/innobase/srv/srv0start.cc

@@ -432,8 +432,7 @@ srv_parse_data_file_paths_and_sizes(
 		    && *(str + 2) == 'w') {
 			str += 3;
 			/* Initialize new raw device only during bootstrap */
-			(srv_data_file_is_raw_partition)[i] =
-			opt_bootstrap ? SRV_NEW_RAW : SRV_OLD_RAW;
+			(srv_data_file_is_raw_partition)[i] = SRV_NEW_RAW;
 		}
 
 		if (*str == 'r' && *(str + 1) == 'a' && *(str + 2) == 'w') {
@@ -441,8 +440,7 @@ srv_parse_data_file_paths_and_sizes(
 
 			/* Initialize new raw device only during bootstrap */
 			if ((srv_data_file_is_raw_partition)[i] == 0) {
-				(srv_data_file_is_raw_partition)[i] =
-				opt_bootstrap ? SRV_NEW_RAW : SRV_OLD_RAW;
+				(srv_data_file_is_raw_partition)[i] = SRV_NEW_RAW;
 			}
 		}