Bug#25222337 FIELD NAME IS NULL IN NEWLY ADDED VIRTUAL INDEX

                  FOR NEWLY ADDED VIRTUAL COLUMN

Merge branch 'mysql-5.7' into mysql-trunk

Author: Thirunarayanan

storage/innobase/dict/dict0mem.cc

@@ -509,7 +509,12 @@ dict_mem_fill_vcol_from_v_indexes(
 	     index != NULL;
 	     index = index->next()) {
 
-		if (!dict_index_has_virtual(index)) {
+		/* Skip if the index have newly added
+		virtual column because field name is NULL.
+		Later virtual column set will be
+		refreshed during loading of table. */
+		if (!dict_index_has_virtual(index)
+		    || index->has_new_v_col) {
 			continue;
 		}