MDEV-12706: !trx->declared_to_be_inside_innodb with innodb_thread_concurrency...

MDEV-12706: !trx->declared_to_be_inside_innodb with innodb_thread_concurrency during CREATE .. SELECT

There were two calls to innobase_srv_conc_enter_innodb on
::general_fetch() due to incorrect merge of 5.7.14.

storage/innobase/handler/ha_innodb.cc

@@ -1835,6 +1835,7 @@ innobase_srv_conc_enter_innodb(
 #endif /* WITH_WSREP */
 
 	trx_t*	trx	= prebuilt->trx;
+
 	if (srv_thread_concurrency) {
 		if (trx->n_tickets_to_enter_innodb > 0) {
 
@@ -10349,8 +10350,6 @@ ha_innobase::general_fetch(
 			DB_FORCED_ABORT, 0,  m_user_thd));
 	}
 
-	innobase_srv_conc_enter_innodb(m_prebuilt);
-
 	if (m_prebuilt->table->is_readable()) {
 	} else if (m_prebuilt->table->corrupted) {
 		DBUG_RETURN(HA_ERR_CRASHED);