Remove a bunch of TODO's, fix perfschema.threads_innodb test

23 files changed, 90 insertions, 304 deletions

diff --git a/include/my_global.h b/include/my_global.h
index 1cf3f217549..6e36f3e33ea 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -817,6 +817,7 @@ static inline bool isfinite(double x) { return std::isfinite(x); }
 #ifndef HAVE_ISNAN
 #define isnan(x) ((x) != (x))
 #endif
+#define my_isnan(x) isnan(x)
 
 #ifdef HAVE_ISINF
 #define my_isinf(X) isinf(X)
diff --git a/mysql-test/suite/perfschema/r/threads_innodb.result b/mysql-test/suite/perfschema/r/threads_innodb.result
index fdbd7469c7e..3fb469ad00b 100644
--- a/mysql-test/suite/perfschema/r/threads_innodb.result
+++ b/mysql-test/suite/perfschema/r/threads_innodb.result
@@ -5,7 +5,10 @@ FROM performance_schema.threads
 WHERE name LIKE 'thread/innodb/%'
 GROUP BY name;
 name	type	processlist_user	processlist_host	processlist_db	processlist_command	processlist_time	processlist_state	processlist_info	parent_thread_id	role	instrumented
-thread/innodb/io_handler_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
+thread/innodb/io_ibuf_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
+thread/innodb/io_log_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
+thread/innodb/io_read_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
+thread/innodb/io_write_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
 thread/innodb/page_cleaner_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
 thread/innodb/srv_error_monitor_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
 thread/innodb/srv_lock_timeout_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 8cf176eea6d..45fb9aa16b2 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7150,6 +7150,8 @@ skip-to-error-number 3000
 
 ER_MYSQL_57_TEST
         eng "5.7 test"
+ER_WRONG_TABLESPACE_NAME 42000
+        eng "Incorrect tablespace name %`-.192s"
 ER_CANNOT_DISCARD_TEMPORARY_TABLE
         eng "Cannot DISCARD/IMPORT tablespace associated with temporary table"
 
diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc
index ede7b02ab81..682be386f2b 100644
--- a/storage/innobase/buf/buf0dump.cc
+++ b/storage/innobase/buf/buf0dump.cc
@@ -25,10 +25,6 @@ Created April 08, 2011 Vasil Dimov
 
 #include "my_global.h"
 #include "my_sys.h"
-/* JAN: TODO: missing MySQL 5.7 include */
-#ifdef HAVE_MY_THREAD_H
-// #include "my_thread.h"
-#endif
 
 #include "mysql/psi/mysql_stage.h"
 #include "mysql/psi/psi.h"
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
index 8c7c9f6bdea..26e0da4e371 100644
--- a/storage/innobase/buf/buf0flu.cc
+++ b/storage/innobase/buf/buf0flu.cc
@@ -3139,9 +3139,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 
 	my_thread_init();
 #ifdef UNIV_PFS_THREAD
-	/* JAN: TODO: MySQL 5.7 PSI
 	pfs_register_thread(page_cleaner_thread_key);
-	*/
 #endif /* UNIV_PFS_THREAD */
 
 #ifdef UNIV_DEBUG_THREAD_CREATION
diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc
index 3c25e37506b..ff5162a68c4 100644
--- a/storage/innobase/dict/dict0stats.cc
+++ b/storage/innobase/dict/dict0stats.cc
@@ -2832,14 +2832,11 @@ dict_stats_fetch_index_stats_step(
 #define PFX	"n_diff_pfx"
 #define PFX_LEN	10
 
-	/** JAN: TODO: MySQL 5.7 native_strncasecmp() */
 	if (stat_name_len == 4 /* strlen("size") */
-		//	    && native_strncasecmp("size", stat_name, stat_name_len) == 0) {
 	    && strncasecmp("size", stat_name, stat_name_len) == 0) {
 		index->stat_index_size = (ulint) stat_value;
 		arg->stats_were_modified = true;
 	} else if (stat_name_len == 12 /* strlen("n_leaf_pages") */
-		// && native_strncasecmp("n_leaf_pages", stat_name, stat_name_len)
 		   && strncasecmp("n_leaf_pages", stat_name, stat_name_len)
 		   == 0) {
 		index->stat_n_leaf_pages = (ulint) stat_value;
@@ -2855,7 +2852,6 @@ dict_stats_fetch_index_stats_step(
 		index->stat_defrag_n_pages_freed = (ulint) stat_value;
 		arg->stats_were_modified = true;
 	} else if (stat_name_len > PFX_LEN /* e.g. stat_name=="n_diff_pfx01" */
-		// && native_strncasecmp(PFX, stat_name, PFX_LEN) == 0) {
 		   && strncasecmp(PFX, stat_name, PFX_LEN) == 0) {
 
 		const char*	num_ptr;
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index 4af92a5e1cb..55c51f1be05 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -7224,7 +7224,7 @@ fil_no_punch_hole(fil_node_t* node)
 	node->punch_hole = false;
 }
 
-#ifdef MYSQL_COMPRESSION_ENCRYPTION
+#ifdef MYSQL_COMPRESSION
 
 /** Set the compression type for the tablespace of a table
 @param[in]	table		The table that should be compressed
@@ -7412,7 +7412,7 @@ fil_encryption_rotate()
 
 	return(true);
 }
-#endif /* MYSQL_COMPRESSION_ENCRYPTION */
+#endif /* MYSQL_COMPRESSION */
 
 /** Build the basic folder name from the path and length provided
 @param[in]	path	pathname (may also include the file basename)
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index 5faa68be0ea..c3db6e5ddea 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -4840,9 +4840,7 @@ fts_check_token(
 		n_chars = 0;
 
 		while (next < end) {
-			/* TODO: JAN: MySQL 5.7 used my_mbcharlen_ptr here
-			char_len = my_mbcharlen_ptr(cs, next, end);*/
-			char_len = cs->cset->charlen(cs, (const uchar*)next, (const uchar*)end);
+			char_len = my_charlen(cs, next, end);
 
 			if (next + char_len > end || char_len == 0) {
 				break;
@@ -4875,9 +4873,7 @@ fts_check_token(
 				}
 
 				/* Move a char forward */
-				/* JAN: TODO: MySQL 5.7
-				start += my_mbcharlen_ptr(cs, start, end); */
-				start += cs->cset->charlen(cs, (const uchar*)next, (const uchar*)end);
+				start += my_charlen(cs, start, end);
 				n_chars = ngram_token_size - 1;
 			}
 		}
@@ -5031,8 +5027,6 @@ int
 fts_tokenize_document_internal(
 /*===========================*/
 	MYSQL_FTPARSER_PARAM*	param,	/*!< in: parser parameter */
-	/* JAN: TODO: MySQL 5.7
-	char*			doc,*/
 	const char*		doc,/*!< in/out: document */
 	int			len)	/*!< in: document length */
 {
diff --git a/storage/innobase/gis/gis0geo.cc b/storage/innobase/gis/gis0geo.cc
index d971c3d639c..b90b47dc08c 100644
--- a/storage/innobase/gis/gis0geo.cc
+++ b/storage/innobase/gis/gis0geo.cc
@@ -365,11 +365,9 @@ mbr_join_square(
 	} while (a != end);
 
 	/* Check for infinity or NaN, so we don't get NaN in calculations */
-	/* JAN: TODO: MYSQL 5.7 GIS
 	if (my_isinf(square) || my_isnan(square)) {
 		return DBL_MAX;
 	}
-	*/
 
 	return square;
 }
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc
index 512fce3ff47..ee89e0a913f 100644
--- a/storage/innobase/gis/gis0rtree.cc
+++ b/storage/innobase/gis/gis0rtree.cc
@@ -1988,11 +1988,9 @@ rtr_estimate_n_rows_in_range(
 	mtr_commit(&mtr);
 	mem_heap_free(heap);
 
-	/* JAN: TODO MYSQL 5.7 GIS
 	if (my_isinf(area) || my_isnan(area)) {
 		return(HA_POS_ERROR);
 	}
-	*/
 
 	return(static_cast<int64_t>(dict_table_get_n_rows(index->table)
 				    * area / n_recs));
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index a7ce1264a05..7d7bce28428 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1196,18 +1196,6 @@ innobase_close_connection(
 	THD*		thd);		/*!< in: MySQL thread handle for
 					which to close the connection */
 
-#ifdef MYSQL_KILL_CONNECTION
-/*****************************************************************//**
-Cancel any pending lock request associated with the current THD. */
-static
-void
-innobase_kill_connection(
-/*=====================*/
-	handlerton*	hton,		/*!< in/out: InnoDB handlerton */
-	THD*		thd);		/*!< in: MySQL thread handle for
-					which to close the connection */
-#endif /* MYSQL_KILL_CONNECTION */
-
 static void innobase_kill_query(handlerton *hton, THD* thd, enum thd_kill_levels level);
 static void innobase_commit_ordered(handlerton *hton, THD* thd, bool all);
 
@@ -1621,7 +1609,7 @@ innobase_create_handler(
 	TABLE_SHARE*	table,
 	MEM_ROOT*	mem_root)
 {
-#ifdef MYSQL_INNODB_PARTITIONS
+#ifdef MYSQL_INNODB_PARTITIONING
 	/* If the table:
 	1) have type InnoDB (not the generic partition handlerton)
 	2) have partitioning defined
@@ -1709,6 +1697,7 @@ thd_trx_is_read_only(
 	return(thd != 0 && thd_tx_is_read_only(thd));
 }
 
+#if 0
 /**
 Check if the transaction can be rolled back
 @param[in] requestor	Session requesting the lock
@@ -1725,10 +1714,7 @@ thd_trx_arbitrate(THD* requestor, THD* holder)
 	ut_a(holder != NULL);
 	ut_a(holder != requestor);
 
-	/* JAN: TODO: MySQL 5.7
 	THD*	victim = thd_tx_arbitrate(requestor, holder);
-	*/
-	THD* victim = NULL;
 
 	ut_a(victim == NULL || victim == requestor || victim == holder);
 
@@ -1742,11 +1728,9 @@ thd_trx_arbitrate(THD* requestor, THD* holder)
 int
 thd_trx_priority(THD* thd)
 {
-	/* JAN: TODO: MySQL 5.7
 	return(thd == NULL ? 0 : thd_tx_priority(thd));
-	*/
-	return (0);
 }
+#endif
 
 #ifdef UNIV_DEBUG
 /**
@@ -2136,9 +2120,6 @@ convert_error_code_to_mysql(
 		return(0);
 
 	case DB_INTERRUPTED:
-		/* JAN: TODO: MySQL 5.7
-		thd_set_kill_status(thd != NULL ? thd : current_thd);
-		return(HA_ERR_GENERIC);*/
 		return(HA_ERR_ABORTED_BY_USER);
 
 	case DB_FOREIGN_EXCEED_MAX_CASCADE:
@@ -3345,18 +3326,11 @@ ha_innobase::ha_innobase(
 			  | HA_CAN_FULLTEXT
 			  | HA_CAN_FULLTEXT_EXT
 		/* JAN: TODO: MySQL 5.7
-		| HA_CAN_FULLTEXT_HINTS
+			  | HA_CAN_FULLTEXT_HINTS
 		*/
 			  | HA_CAN_EXPORT
 			  | HA_CAN_RTREEKEYS
-                          | HA_CONCURRENT_OPTIMIZE
-		/* JAN: TODO: MySQL 5.7
-			  | HA_HAS_RECORDS
-			  | HA_NO_READ_LOCAL_LOCK
-			  | HA_GENERATED_COLUMNS
-			  | HA_ATTACHABLE_TRX_COMPATIBLE
-			  | HA_CAN_INDEX_VIRTUAL_GENERATED_COLUMN
-		*/
+			  | HA_CONCURRENT_OPTIMIZE
 			  |  (srv_force_primary_key ? HA_REQUIRE_PRIMARY_KEY : 0)
 		  ),
 	m_start_of_scan(),
@@ -3440,7 +3414,10 @@ innobase_register_trx(
 	THD*		thd,	/* in: MySQL thd (connection) object */
 	trx_t*		trx)	/* in: transaction to register */
 {
-	/* JAN: TODO: MySQL 5.7
+	/* JAN: TODO: MySQL 5.7 PSI
+	const ulonglong	trx_id = static_cast<const ulonglong>(
+		trx_get_id_for_print(trx));
+
 	trans_register_ha(thd, FALSE, hton, &trx_id);
 	*/
 	trans_register_ha(thd, FALSE, hton);
@@ -3921,50 +3898,6 @@ innobase_init_abort()
 }
 
 
-/*****************************************************************//**
-This function checks if the given db.tablename is a system table
-supported by Innodb and is used as an initializer for the data member
-is_supported_system_table of InnoDB storage engine handlerton.
-Currently we support only plugin, servers,  help- and time_zone- related
-system tables in InnoDB. Please don't add any SE-specific system tables here.
-
-@param db				database name to check.
-@param table_name			table name to check.
-@param is_sql_layer_system_table	if the supplied db.table_name is a SQL
-					layer system table.
-*/
-
-#ifdef MYSQL_IS_SUPPORTED_SYSTEM_TABLE
-static bool innobase_is_supported_system_table(const char *db,
-						const char *table_name,
-						bool is_sql_layer_system_table)
-{
-	static const char* supported_system_tables[]= { "help_topic",
-							"help_category",
-							"help_relation",
-							"help_keyword",
-							"plugin",
-							"servers",
-							"time_zone",
-							"time_zone_leap_second",
-							"time_zone_name",
-							"time_zone_transition",
-							"time_zone_transition_type",
-							(const char *)NULL };
-
-	if (!is_sql_layer_system_table)
-		return false;
-
-	for (unsigned i= 0; supported_system_tables[i] != NULL; ++i)
-	{
-		if (!strcmp(table_name, supported_system_tables[i]))
-			return true;
-	}
-
-	return false;
-}
-#endif /* MYSQL_IS_SUPPORTED_SYSTEM_TABLE */
-
 #ifdef MYSQL_ENCRYPTION
 /* mutex protecting the master_key_id */
 ib_mutex_t	master_key_id_mutex;
@@ -4101,9 +4034,6 @@ innobase_init(
 	innobase_hton->db_type = DB_TYPE_INNODB;
 	innobase_hton->savepoint_offset = sizeof(trx_named_savept_t);
 	innobase_hton->close_connection = innobase_close_connection;
-	// JAN: TODO: MySQL 5.7:
-	// innobase_hton->kill_connection = innobase_kill_connection;
-	//
 	innobase_hton->kill_query = innobase_kill_query;
 	innobase_hton->savepoint_set = innobase_savepoint;
 	innobase_hton->savepoint_rollback = innobase_rollback_to_savepoint;
@@ -4173,11 +4103,6 @@ innobase_init(
 
 	innodb_remember_check_sysvar_funcs();
 
-#ifdef MYSQL_IS_SUPPORTED_SYSTEM_TABLE
-	innobase_hton->is_supported_system_table=
-		innobase_is_supported_system_table;
-#endif
-
 #ifdef MYSQL_ENCRYPTION
 	innobase_hton->rotate_encryption_master_key =
 		innobase_encryption_key_rotation;
@@ -4721,8 +4646,6 @@ innobase_change_buffering_inited_ok:
 	run with --help --verbose options. */
 	/* JAN: TODO: MySQL 5.7 has opt_verbose
 	if (opt_help && opt_verbose
-	*/
-	if (opt_help
 	    && srv_buf_pool_size > srv_buf_pool_def_size) {
 		ib::warn() << "Setting innodb_buf_pool_size to "
 			<< srv_buf_pool_def_size << " for fast startup, "
@@ -4730,6 +4653,7 @@ innobase_change_buffering_inited_ok:
 		srv_buf_pool_size_org = srv_buf_pool_size;
 		srv_buf_pool_size = srv_buf_pool_def_size;
 	}
+	*/
 
 	/* Since we in this module access directly the fields of a trx
 	struct, and due to different headers and flags it might happen that
@@ -5262,14 +5186,9 @@ innobase_rollback(
 #ifdef UNIV_DEBUG
 			char	buffer[1024];
 
-			/* JAN: TODO: MySQL 5.7
 			ib::info() << "Forced rollback : "
-				<< thd_security_context(thd, buffer,
-							sizeof(buffer),
-				512);
-			*/
-			thd_get_error_context_description(thd, buffer,
-				sizeof(buffer), 512);
+				<< thd_get_error_context_description(thd,
+						buffer, sizeof(buffer), 512);
 #endif /* UNIV_DEBUG */
 
 			trx->state = TRX_STATE_NOT_STARTED;
@@ -5712,37 +5631,6 @@ innobase_close_connection(
 	DBUG_RETURN(0);
 }
 
-#ifdef MYSQL_KILL_CONNECTION
-/*****************************************************************//**
-Cancel any pending lock request associated with the current THD. */
-static
-void
-innobase_kill_connection(
-/*======================*/
-	handlerton*    hton,   /*!< in:  innobase handlerton */
-	THD*		thd)    /*!< in: handle to the MySQL thread being
-				killed */
-{
-	DBUG_ENTER("innobase_kill_connection");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
-
-	trx_t*	trx = thd_to_trx(thd);
-
-	if (trx != NULL) {
-
-		/* Cancel a pending lock request if there are any */
-		dberr_t err = lock_trx_handle_wait(trx, false, false);
-
-		if (err != DB_SUCCESS && err != DB_LOCK_WAIT) {
-			ib::warn() << "Killing connection failed " << ut_strerr(err) << "("<<err<<")";
-		}
-
-	}
-
-	DBUG_VOID_RETURN;
-}
-#endif /* MYSQL_KILL_CONNECTION */
-
 UNIV_INTERN void lock_cancel_waiting_and_release(lock_t* lock);
 
 /*****************************************************************//**
@@ -6828,9 +6716,6 @@ ha_innobase::innobase_initialize_autoinc()
 	const Field*	field = table->found_next_number_field;
 
 	if (field != NULL) {
-		/* JAN: TODO: MySQL 5.7
-		auto_inc = field->get_max_int_value();
-		*/
 		auto_inc = innobase_get_int_col_max_value(field);
 		ut_ad(!innobase_is_v_fld(field));
 
@@ -6892,9 +6777,6 @@ ha_innobase::innobase_initialize_autoinc()
 		case DB_SUCCESS: {
 			ulonglong	col_max_value;
 
-			/* JAN: TODO: MySQL 5.7
-			col_max_value = field->get_max_int_value();
-			*/
 			col_max_value =  innobase_get_int_col_max_value(field);
 
 			/* At the this stage we do not know the increment
@@ -7358,7 +7240,7 @@ ha_innobase::open(
 
 	info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);
 
-#ifdef MYSQL_COMPRESSION // MySQL 5.7 Compression
+#ifdef MYSQL_COMPRESSION
 	dberr_t	err = fil_set_compression(m_prebuilt->table,
 					  table->s->compress.str);
 
@@ -7963,10 +7845,6 @@ get_innobase_type_from_mysql_type(
 	case MYSQL_TYPE_BLOB:
 	case MYSQL_TYPE_LONG_BLOB:
 		return(DATA_BLOB);
-	/* JAN: TODO: MySQL 5.7 JSON
-        case MYSQL_TYPE_JSON:   // JSON fields are stored as BLOBs
-		return(DATA_BLOB);
-	*/
 	case MYSQL_TYPE_NULL:
 		/* MySQL currently accepts "NULL" datatype, but will
 		reject such datatype in the next release. We will cope
@@ -9257,9 +9135,6 @@ no_commit:
 		/* We need the upper limit of the col type to check for
 		whether we update the table autoinc counter or not. */
 		col_max_value = innobase_get_int_col_max_value(table->next_number_field);
-			/* JAN: TODO: MySQL 5.7
-			table->next_number_field->get_max_int_value();
-			*/
 
 		/* Get the value that MySQL attempted to store in the table. */
 		auto_inc = table->next_number_field->val_int();
@@ -10048,9 +9923,6 @@ ha_innobase::update_row(
 
 		/* We need the upper limit of the col type to check for
 		whether we update the table autoinc counter or not. */
-			/* JAN: TODO: MySQL 5.7
-			table->next_number_field->get_max_int_value();
-			*/
 		col_max_value =
 			innobase_get_int_col_max_value(table->next_number_field);
 
@@ -10372,10 +10244,6 @@ convert_search_mode_to_innobase(
 		return(PAGE_CUR_MBR_EQUAL);
 	case HA_READ_PREFIX:
 		return(PAGE_CUR_UNSUPP);
-	/* JAN: TODO: MySQL 5.7
-	case HA_READ_INVALID:
-		return(PAGE_CUR_UNSUPP);
-		*/
 	/* do not use "default:" in order to produce a gcc warning:
 	enumeration value '...' not handled in switch
 	(if -Wswitch or -Wall is used) */
@@ -12109,7 +11977,7 @@ innodb_base_col_setup(
 }
 #endif /* MYSQL_VIRTUAL_COLUMNS */
 
-#ifdef MYSQL_BASE_COLUMN
+#ifdef MYSQL_VIRTUAL_COLUMNS
 /** Set up base columns for stored column
 @param[in]	table	InnoDB table
 @param[in]	field	MySQL field
@@ -12422,7 +12290,7 @@ err_col:
 #endif
 	}
 
-#ifdef MYSQL_STORED_BASE_COLUMNS
+#ifdef MYSQL_VIRTUAL_COLUMNS
 		if (is_stored) {
 			ut_ad(!is_virtual);
 			/* Added stored column in m_s_cols list. */
@@ -12549,7 +12417,7 @@ err_col:
 	} else {
 		const char*     algorithm = NULL;
 
-#if MYSQL_COMPRESSION_ENCRYPTION
+#if MYSQL_COMPRESSION
 		const char*     algorithm = m_create_info->compress.str;
 
 		if (!(m_flags2 & DICT_TF2_USE_FILE_PER_TABLE)
@@ -12607,7 +12475,7 @@ err_col:
 						  DICT_TF2_ENCRYPTION);
 			}
 		}
-#endif /* MYSQL_COMPRESSION_ENCRYPTION */
+#endif /* MYSQL_COMPRESSION */
 
 		if (err == DB_SUCCESS) {
 			err = row_create_table_for_mysql(
@@ -12967,6 +12835,15 @@ create_table_info_t::create_option_data_directory_is_valid()
 	return(is_valid);
 }
 
+
+#define IDENT_NAME_OK 0
+static int check_tablespace_name(const char *name)
+{
+  CHARSET_INFO *cs= system_charset_info;
+  return cs->cset->numchars(cs, name, name + strlen(name)) > NAME_CHAR_LEN;
+}
+
+
 /** Validate the tablespace name provided for a tablespace DDL
 @param[in]	name		A proposed tablespace name
 @param[in]	for_table	Caller is putting a table here
@@ -12982,11 +12859,9 @@ validate_tablespace_name(
 	/* This prefix is reserved by InnoDB for use in internal tablespace names. */
 	const char reserved_space_name_prefix[] = "innodb_";
 
-	/* JAN: TODO: MySQL 5.7
 	if (check_tablespace_name(name) != IDENT_NAME_OK) {
 		err = HA_WRONG_CREATE_OPTION;
 	}
-	*/
 
 	/* The tablespace name cannot start with `innodb_`. */
 	if (strlen(name) >= sizeof(reserved_space_name_prefix) - 1
@@ -13001,9 +12876,7 @@ validate_tablespace_name(
 			table into one of these by CREATE/ALTER TABLE */
 			if (!for_table) {
 				my_printf_error(
-					ER_WRONG_NAME_FOR_CATALOG,
-					// JAN: TODO: MySQL 5.7
-					//ER_WRONG_TABLESPACE_NAME,
+					ER_WRONG_TABLESPACE_NAME,
 					"InnoDB: `%s` is a reserved"
 					" tablespace name.",
 					MYF(0), name);
@@ -13011,9 +12884,7 @@ validate_tablespace_name(
 			}
 		} else {
 			my_printf_error(
-				ER_WRONG_NAME_FOR_CATALOG,
-				// JAN: TODO: MYSQL 5.7
-				//ER_WRONG_TABLESPACE_NAME,
+				ER_WRONG_TABLESPACE_NAME,
 					"InnoDB: A general tablespace"
 					" name cannot start with `%s`.",
 					MYF(0), reserved_space_name_prefix);
@@ -13023,9 +12894,7 @@ validate_tablespace_name(
 
 	/* The tablespace name cannot contain a '/'. */
 	if (memchr(name, '/', strlen(name)) != NULL) {
-			my_printf_error(
-				ER_WRONG_NAME_FOR_CATALOG,
-		//		my_printf_error(ER_WRONG_TABLESPACE_NAME,
+				my_printf_error(ER_WRONG_TABLESPACE_NAME,
 			"InnoDB: A general tablespace name cannot"
 			" contain '/'.", MYF(0));
 		err = HA_WRONG_CREATE_OPTION;
@@ -13428,7 +13297,7 @@ create_table_info_t::create_options_are_invalid()
 		}
 	}
 
-#ifdef MYSQL_COMPRESSION_ENCRYPTION
+#ifdef MYSQL_COMPRESSION
 	/* Validate the page compression parameter. */
 	if (!create_option_compression_is_valid()) {
 		return("COMPRESSION");
@@ -13830,10 +13699,6 @@ create_table_info_t::innobase_table_flags()
 			}
 		} else if (key->flags & HA_SPATIAL) {
 			if (m_create_info->options & HA_LEX_CREATE_TMP_TABLE
-				/* JAN: TODO: MySQL 5.7
-			    && m_create_info->options
-			       & HA_LEX_CREATE_INTERNAL_TMP_TABLE
-				*/
 			    && !m_use_file_per_table) {
 				my_error(ER_TABLE_CANT_HANDLE_SPKEYS, MYF(0));
 				DBUG_RETURN(false);
@@ -14974,9 +14839,7 @@ ha_innobase::truncate()
 			ER_TABLESPACE_DISCARDED : ER_TABLESPACE_MISSING),
 			table->s->table_name.str);
 		table->status = STATUS_NOT_FOUND;
-		// JAN: TODO: MySQL 5.7
-		// error = HA_ERR_TABLESPACE_MISSING;
-		error = HA_ERR_NO_SUCH_TABLE;
+		error = HA_ERR_TABLESPACE_MISSING;
 		break;
 
 	default:
@@ -15929,16 +15792,13 @@ ha_innobase::records(ha_rows* num_rows)
 		DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
 
 	} else if (m_prebuilt->table->ibd_file_missing) {
-		// JAN: TODO: MySQL 5.7
 		ib_senderrf(
 			m_user_thd, IB_LOG_LEVEL_ERROR,
-			ER_TABLESPACE_DISCARDED,
-			//ER_TABLESPACE_MISSING,
+			ER_TABLESPACE_MISSING,
 			table->s->table_name.str);
 
 		*num_rows = HA_POS_ERROR;
-		DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
-		//DBUG_RETURN(HA_ERR_TABLESPACE_MISSING);
+		DBUG_RETURN(HA_ERR_TABLESPACE_MISSING);
 
 	} else if (m_prebuilt->table->corrupted) {
 		ib_errf(m_user_thd, IB_LOG_LEVEL_WARN,
@@ -15987,9 +15847,7 @@ ha_innobase::records(ha_rows* num_rows)
 		break;
 	case DB_INTERRUPTED:
 		*num_rows = HA_POS_ERROR;
-		DBUG_RETURN(ER_QUERY_INTERRUPTED);
-		// JAN: TODO: MySQL 5.7
-		//DBUG_RETURN(HA_ERR_QUERY_INTERRUPTED);
+		DBUG_RETURN(HA_ERR_QUERY_INTERRUPTED);
 		break;
 	default:
 		/* No other error besides the three below is returned from
@@ -16002,9 +15860,7 @@ ha_innobase::records(ha_rows* num_rows)
 
 	if (thd_killed(m_user_thd)) {
 		*num_rows = HA_POS_ERROR;
-		DBUG_RETURN(ER_QUERY_INTERRUPTED);
-		// JAN: TODO: MySQL 5.7
-		// DBUG_RETURN(HA_ERR_QUERY_INTERRUPTED);
+		DBUG_RETURN(HA_ERR_QUERY_INTERRUPTED);
 	}
 
 	DBUG_RETURN(0);
@@ -16262,13 +16118,6 @@ ha_innobase::read_time(
 		return(handler::read_time(index, ranges, rows));
 	}
 
-#ifdef MYSQL_ROWS
-	if (rows <= 2) {
-
-		return((double) rows);
-	}
-#endif
-
 	/* Assume that the read time is proportional to the scan time for all
 	rows + at most one seek per range. */
 
@@ -16747,14 +16596,7 @@ ha_innobase::info_low(
 
 			KEY*	key = &table->key_info[i];
 
-			/* Check if this index supports index statistics. */
-			// JAN: TODO: MySQL 5.7 index statistics
-			// if (!key->supports_records_per_key()) {
-			//	continue;
-			// }
-			// for (j = 0; j < key->actual_key_parts; j++) {
-
-			for (j = 0; j < table->key_info[i].ext_key_parts; j++) {
+			for (j = 0; j < key->ext_key_parts; j++) {
 
 				if ((key->flags & HA_FULLTEXT)
 				    || (key->flags & HA_SPATIAL)) {
@@ -16799,20 +16641,6 @@ ha_innobase::info_low(
 				calculated at different time. This is
 				acceptable. */
 
-#ifdef MYSQL_REC_PER_KEY
-				const rec_per_key_t	rec_per_key
-					= innodb_rec_per_key(
-						index, j,
-						index->table->stat_n_rows);
-
-				key->set_records_per_key(j, rec_per_key);
-#endif /* MYSQL_REC_PER_KEY */
-
-				/* The code below is legacy and should be
-				removed together with this comment once we
-				are sure the new floating point rec_per_key,
-				set via set_records_per_key(), works fine. */
-
 				ulong	rec_per_key_int = static_cast<ulong>(
 					innodb_rec_per_key(index, j,
 							   stats.records));
@@ -17228,11 +17056,6 @@ ha_innobase::check(
 		/* Now that the table is already marked as corrupted,
 		there is no need to check any index of this table */
 		m_prebuilt->trx->op_info = "";
-		/* JAN: TODO: MySQL 5.7
-		if (thd_killed(m_user_thd)) {
-			thd_set_kill_status(m_user_thd);
-		}
-		*/
 
 		DBUG_RETURN(HA_ADMIN_CORRUPT);
 	}
@@ -17412,10 +17235,6 @@ ha_innobase::check(
 	}
 #endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */
 	m_prebuilt->trx->op_info = "";
-	//if (thd_killed(m_user_thd)) {
-	if (thd_kill_level(m_user_thd)) {
-		// thd_set_kill_status(m_user_thd);
-	}
 
 	DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
 }
@@ -17787,7 +17606,6 @@ get_table_name_info(
 	st_handler_tablename*	f_key_info,
 	const dict_foreign_t*	foreign)
 {
-	// JAN: TODO: MySQL 5.7 include/mysql_com.h
 #define FILENAME_CHARSET_MBMAXLEN 5
 	char	tmp_buff[NAME_CHAR_LEN * FILENAME_CHARSET_MBMAXLEN + 1];
 	char	name_buff[NAME_CHAR_LEN * FILENAME_CHARSET_MBMAXLEN + 1];
@@ -19493,9 +19311,6 @@ ha_innobase::get_auto_increment(
 	/* We need the upper limit of the col type to check for
 	whether we update the table autoinc counter or not. */
 	ulonglong	col_max_value = innobase_get_int_col_max_value(table->next_number_field);
-	/* JAN: TODO: MySQL 5.7
-		table->next_number_field->get_max_int_value();
-	*/
 
 	/* Called for the first time ? */
 	if (trx->n_autoinc_rows == 0) {
@@ -19513,12 +19328,6 @@ ha_innobase::get_auto_increment(
 	/* Not in the middle of a mult-row INSERT. */
 	} else if (m_prebuilt->autoinc_last_value == 0) {
 		set_if_bigger(*first_value, autoinc);
-		/* Check for -ve values. */
-		/* JAN: TODO: MySQL 5.7 : */
-		// } else if (*first_value > col_max_value && trx->n_autoinc_rows > 0) {
-		/* Set to next logical value. */
-		// ut_a(autoinc > trx->n_autoinc_rows);
-		//*first_value = (autoinc - trx->n_autoinc_rows) - 1;
 	}
 
 	if (*first_value > col_max_value) {
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index 312584d5a0e..720700a540d 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -226,9 +226,6 @@ public:
 
 	void position(uchar *record);
 
-	// MySQL 5.7 Select count optimization
-	// int records(ha_rows* num_rows);
-
 	ha_rows records_in_range(
 		uint			inx,
 		key_range*		min_key,
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index ba95c9760a6..9de2f7c1d1c 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -68,8 +68,6 @@ Smart ALTER TABLE
 static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ONLINE_CREATE
 	= Alter_inplace_info::ADD_INDEX
 	| Alter_inplace_info::ADD_UNIQUE_INDEX;
-	// JAN: TODO: MySQL 5.7
-	//	| Alter_inplace_info::ADD_SPATIAL_INDEX;
 
 /** Operations for rebuilding a table in place */
 static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_REBUILD
@@ -82,7 +80,7 @@ static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_REBUILD
 	| Alter_inplace_info::ALTER_COLUMN_ORDER
 	| Alter_inplace_info::DROP_COLUMN
 	| Alter_inplace_info::ADD_COLUMN
-#ifdef MYSQL_STORED_COLUMNS
+#ifdef MYSQL_VIRTUAL_COLUMNS
 	| Alter_inplace_info::ALTER_STORED_COLUMN_ORDER
 	| Alter_inplace_info::DROP_STORED_COLUMN
 	| Alter_inplace_info::ADD_STORED_BASE_COLUMN
@@ -660,7 +658,7 @@ ha_innobase::check_if_supported_inplace_alter(
 		| INNOBASE_ALTER_NOREBUILD
 		| INNOBASE_ALTER_REBUILD)) {
 
-#ifdef MYSQL_STORED_COLUMNS
+#ifdef MYSQL_VIRTUAL_COLUMNS
 		if (ha_alter_info->handler_flags
 		    & Alter_inplace_info::ALTER_STORED_COLUMN_TYPE) {
 			ha_alter_info->unsupported_reason = innobase_get_err_msg(
@@ -1358,7 +1356,7 @@ next_rec:
 	return(NULL);
 }
 
-#ifdef MYSQL_STORED_COLUMNS
+#ifdef MYSQL_VIRTUAL_COLUMNS
 
 /** Check whether given column is a base of stored column.
 @param[in]	col_name	column name
@@ -1421,7 +1419,7 @@ innobase_check_fk_stored(
 
 	return(false);
 }
-#endif /* MYSQL_STORED_COLUMNS */
+#endif /* MYSQL_VIRTUAL_COLUMNS */
 
 /** Create InnoDB foreign key structure from MySQL alter_info
 @param[in]	ha_alter_info	alter table info
@@ -1669,7 +1667,7 @@ innobase_get_foreign_key_info(
 			goto err_exit;
 		}
 
-#ifdef MYSQL_STORED_BASE_COLUMNS
+#ifdef MYSQL_VIRTUAL_COLUMNS
 		if (innobase_check_fk_stored(
 			add_fk[num_fk], table, s_cols)) {
 			my_error(ER_CANNOT_ADD_FOREIGN_BASE_COL_STORED, MYF(0));
@@ -5605,7 +5603,7 @@ rename_indexes_in_cache(
 }
 #endif /* MYSQL_RENAME_INDEX */
 
-#ifdef MYSQL_STORED_COLUMNS
+#ifdef MYSQL_VIRTUAL_COLUMNS
 /** Fill the stored column information in s_cols list.
 @param[in]	altered_table	mysql table object
 @param[in]	table		innodb table object
@@ -5653,7 +5651,7 @@ alter_fill_stored_column(
 		(*s_cols)->push_back(s_col);
 	}
 }
-#endif /* MYSQL_STORED_COLUMNS */
+#endif /* MYSQL_VIRTUAL_COLUMNS */
 
 /** Allows InnoDB to update internal structures with concurrent
 writes blocked (provided that check_if_supported_inplace_alter()
@@ -6232,7 +6230,7 @@ check_if_can_drop_indexes:
 	    & Alter_inplace_info::ADD_FOREIGN_KEY) {
 		ut_ad(!m_prebuilt->trx->check_foreigns);
 
-#ifdef MYSQL_STORED_COLUMNS
+#ifdef MYSQL_VIRTUAL_COLUMNS
 		alter_fill_stored_column(altered_table, m_prebuilt->table,
 					 &s_cols, &s_heap);
 #endif
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index 524cbc890f7..1c17ac91856 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -1772,22 +1772,10 @@ i_s_cmp_per_index_fill_low(
 		fields[IDX_UNCOMPRESS_TIME]->store(
 			   iter->second.decompressed_usec / 1000000, true);
 
-#ifdef MYSQL_SCHEMA_TABLE_STORE_RECORD2
-		int	error;
-		if ((error = schema_table_store_record2(thd, table, false))) {
-			mutex_exit(&dict_sys->mutex);
-			if (convert_heap_table_to_ondisk(thd, table, error) != 0) {
-				status = 1;
-				goto err;
-			}
-			mutex_enter(&dict_sys->mutex);
-		}
-#else
 		if (schema_table_store_record(thd, table)) {
 			status = 1;
 			break;
 		}
-#endif
 		/* Release and reacquire the dict mutex to allow other
 		threads to proceed. This could eventually result in the
 		contents of INFORMATION_SCHEMA.innodb_cmp_per_index being
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index 6613d35f162..55953d61315 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -39,6 +39,22 @@ class Field;
 struct fts_string_t;
 //typedef struct charset_info_st CHARSET_INFO;
 
+// JAN: TODO missing features:
+#undef MYSQL_57_SELECT_COUNT_OPTIMIZATION
+#undef MYSQL_COMPRESSION
+#undef MYSQL_ENCRYPTION
+#undef MYSQL_FTS_PARSER
+#undef MYSQL_FT_INIT_EXT
+#undef MYSQL_INNODB_API_CB
+#undef MYSQL_INNODB_PARTITIONING
+#undef MYSQL_PFS
+#undef MYSQL_RENAME_INDEX
+#undef MYSQL_REPLACE_TRX_IN_THD
+#undef MYSQL_SPATIAL_INDEX
+#undef MYSQL_STORE_FTS_DOC_ID
+#undef MYSQL_TABLESPACES
+#undef MYSQL_VIRTUAL_COLUMNS
+
 /*********************************************************************//**
 Wrapper around MySQL's copy_and_convert function.
 @return number of bytes copied to 'to' */
@@ -387,6 +403,7 @@ thd_trx_is_read_only(
 /*=================*/
 	THD*	thd);	/*!< in/out: thread handle */
 
+#if 0
 /**
 Check if the transaction can be rolled back
 @param[in] requestor	Session requesting the lock
@@ -403,6 +420,10 @@ thd_trx_arbitrate(THD* requestor, THD* holder);
 int
 thd_trx_priority(THD* thd);
 
+#else
+static inline THD* thd_trx_arbitrate(THD*, THD*) { return NULL; }
+static inline int thd_trx_priority(THD*) { return 0; }
+#endif
 /******************************************************************//**
 Check if the transaction is an auto-commit transaction. TRUE also
 implies that it is a SELECT (read-only) transaction.
@@ -606,8 +627,6 @@ normalize_table_name_c_low(
 InnoDB index push-down condition check defined in ha_innodb.cc
 @return ICP_NO_MATCH, ICP_MATCH, or ICP_OUT_OF_RANGE */
 
-/* JAN: TODO: missing 5.7 header */
-//#include <my_icp.h>
 #include <my_compare.h>
 
 ICP_RESULT
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index be6461edec1..5f8893b3e28 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -610,7 +610,8 @@ schema */
 #  define pfs_register_thread(key)			\
 do {								\
 	struct PSI_thread* psi = PSI_THREAD_CALL(new_thread)(key, NULL, 0);\
-	PSI_THREAD_CALL(set_thread_os_id)(psi);			\
+	/* JAN: TODO: MYSQL 5.7 PSI                             \
+	PSI_THREAD_CALL(set_thread_os_id)(psi);	*/		\
 	PSI_THREAD_CALL(set_thread)(psi);			\
 } while (0)
 
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index 927c3d5ff2c..e6b9b761d85 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -29,9 +29,6 @@ Created 5/7/1996 Heikki Tuuri
 
 #include "ha_prototypes.h"
 
-#ifdef MYSQL_SERVICE_THD_ENGINE_LOCK
-#include <mysql/service_thd_engine_lock.h>
-#endif
 #include <mysql/service_thd_error_context.h>
 
 #include "lock0lock.h"
diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc
index 0774182d934..1330658626e 100644
--- a/storage/innobase/lock/lock0wait.cc
+++ b/storage/innobase/lock/lock0wait.cc
@@ -521,8 +521,7 @@ DECLARE_THREAD(lock_wait_timeout_thread)(
 	ut_ad(!srv_read_only_mode);
 
 #ifdef UNIV_PFS_THREAD
-	// JAN: TODO: MySQL 5.7 PSI
-//	pfs_register_thread(srv_lock_timeout_thread_key);
+	pfs_register_thread(srv_lock_timeout_thread_key);
 #endif /* UNIV_PFS_THREAD */
 
 	lock_sys->timeout_thread_active = true;
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index a9c37fbdc3d..a7c3f337287 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -919,8 +919,7 @@ DECLARE_THREAD(recv_writer_thread)(
 	ut_ad(!srv_read_only_mode);
 
 #ifdef UNIV_PFS_THREAD
-	// JAN: TODO: MYSQL 5.7 PSI
-	//	pfs_register_thread(recv_writer_thread_key);
+	pfs_register_thread(recv_writer_thread_key);
 #endif /* UNIV_PFS_THREAD */
 
 #ifdef UNIV_DEBUG_THREAD_CREATION
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 047eec7949c..02727ae9279 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -926,7 +926,7 @@ os_aio_windows_handler(
 	IORequest*	type);
 #endif /* WIN_ASYNC_IO */
 
-#ifdef MYSQL_COMPRESSION_ENCRYPTION
+#ifdef MYSQL_COMPRESSION
 /** Allocate a page for sync IO
 @return pointer to page */
 static
@@ -995,7 +995,7 @@ os_free_block(Block* block)
 		ut_free(block);
 	}
 }
-#endif /* MYSQL_COMPRESSION_ENCRYPTION */
+#endif /* MYSQL_COMPRESSION */
 
 /** Generic AIO Handler methods. Currently handles IO post processing. */
 class AIOHandler {
@@ -1239,7 +1239,7 @@ AIOHandler::check_read(Slot* slot, ulint n_bytes)
 		err = DB_FAIL;
 	}
 
-#ifdef MYSQL_COMPRESSION_ENCRYPTION
+#ifdef MYSQL_COMPRESSION
 	if (slot->buf_block != NULL) {
 		os_free_block(slot->buf_block);
 		slot->buf_block = NULL;
@@ -1749,7 +1749,7 @@ os_file_io_complete(
 	ulint		offset,
 	ulint		len)
 {
-#ifdef MYSQL_ENCRYPTION_COMPRESSION
+#ifdef MYSQL_ENCRYPTION
 	/* We never compress/decompress the first page */
 	ut_a(offset > 0);
 	ut_ad(type.validate());
@@ -1805,7 +1805,7 @@ os_file_io_complete(
 	}
 
 	ut_ad(!type.is_log());
-#endif /* MYSQL_ENCRYPTION_COMPRESSION */
+#endif /* MYSQL_ENCRYPTION */
 
 	return(DB_SUCCESS);
 }
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index f738bcaa22f..49de954b290 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -1746,8 +1746,7 @@ DECLARE_THREAD(srv_monitor_thread)(
 #endif /* UNIV_DEBUG_THREAD_CREATION */
 
 #ifdef UNIV_PFS_THREAD
-	// JAN: TODO: MySQL 5.7
-	// pfs_register_thread(srv_monitor_thread_key);
+	pfs_register_thread(srv_monitor_thread_key);
 #endif /* UNIV_PFS_THREAD */
 	srv_monitor_active = TRUE;
 
@@ -1930,8 +1929,7 @@ DECLARE_THREAD(srv_error_monitor_thread)(
 #endif /* UNIV_DEBUG_THREAD_CREATION */
 
 #ifdef UNIV_PFS_THREAD
-	// JAN: TODO: MySQL 5.7
-	// pfs_register_thread(srv_error_monitor_thread_key);
+	pfs_register_thread(srv_error_monitor_thread_key);
 #endif /* UNIV_PFS_THREAD */
 	srv_error_monitor_active = TRUE;
 
@@ -2620,8 +2618,7 @@ DECLARE_THREAD(srv_master_thread)(
 #endif /* UNIV_DEBUG_THREAD_CREATION */
 
 #ifdef UNIV_PFS_THREAD
-	// JAN: TODO: MySQL 5.7 PSI
-	// pfs_register_thread(srv_master_thread_key);
+	pfs_register_thread(srv_master_thread_key);
 #endif /* UNIV_PFS_THREAD */
 
 	srv_main_thread_process_no = os_proc_get_number();
@@ -3040,8 +3037,7 @@ DECLARE_THREAD(srv_purge_coordinator_thread)(
 	rw_lock_x_unlock(&purge_sys->latch);
 
 #ifdef UNIV_PFS_THREAD
-	// JAN: TODO: MYSQL 5.7
-	// pfs_register_thread(srv_purge_thread_key);
+	pfs_register_thread(srv_purge_thread_key);
 #endif /* UNIV_PFS_THREAD */
 
 #ifdef UNIV_DEBUG_THREAD_CREATION
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 294431c8928..7417dee4fc5 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -302,7 +302,6 @@ DECLARE_THREAD(io_handler_thread)(
 		<< os_thread_pf(os_thread_get_curr_id());
 #endif
 
-#ifdef JAN //JAN: TODO: MySQL 5.7 PSI == UNIV_PFS_THREAD
 	/* For read only mode, we don't need ibuf and log I/O thread.
 	Please see innobase_start_or_create_for_mysql() */
 	ulint   start = (srv_read_only_mode) ? 0 : 2;
@@ -326,7 +325,6 @@ DECLARE_THREAD(io_handler_thread)(
 	} else {
 		pfs_register_thread(io_handler_thread_key);
 	}
-#endif /* UNIV_PFS_THREAD */
 
 	while (srv_shutdown_state != SRV_SHUTDOWN_EXIT_THREADS
 	       || buf_page_cleaner_is_active
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
index 7071b53fffe..a22b903df7a 100644
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -868,8 +868,7 @@ DECLARE_THREAD(trx_rollback_or_clean_all_recovered)(
 	ut_ad(!srv_read_only_mode);
 
 #ifdef UNIV_PFS_THREAD
-	// JAN: TODO: MYSQL 5.7 PSI
-	// pfs_register_thread(trx_rollback_clean_thread_key);
+	pfs_register_thread(trx_rollback_clean_thread_key);
 #endif /* UNIV_PFS_THREAD */
 
 	trx_rollback_or_clean_recovered(TRUE);