MDEV-24813 [demo] Revert innodb changes introduced in the grandparent commit

Should have no test failures now.

Author: mariadb-YuchenPei

mysql-test/main/disabled.def

@@ -16,3 +16,4 @@ mysql_embedded           : Bug#12561297 2011-05-14 Anitha Dependent on PB2 chang
 file_contents            : MDEV-6526 these files are not installed anymore
 max_statement_time       : cannot possibly work, depends on timing
 partition_open_files_limit : open_files_limit check broken by MDEV-18360
+innodb_full_scan         : MDEV-24813 WIP

storage/innobase/handler/ha_innodb.cc

@@ -15899,25 +15899,6 @@ ha_innobase::extra(
 	return(0);
 }
 
-int
-ha_innobase::extra_opt(
-/*===============*/
-	enum ha_extra_function operation,
-			   /*!< in: HA_EXTRA_FLUSH or some other flag */
-	ulong arg)
-{
-	switch (operation) {
-		/* TODO: ignoring LIMIT for now */
-	case HA_EXTRA_FULL_SCAN:
-		m_prebuilt->full_table_scan= true;
-		break;
-	default:/* Do nothing */
-		;
-	}
-
-	return(0);
-}
-
 /**
 MySQL calls this method at the end of each statement */
 int
@@ -15938,7 +15919,6 @@ ha_innobase::reset()
 	m_prebuilt->autoinc_last_value = 0;
 
 	m_prebuilt->skip_locked = false;
-	m_prebuilt->full_table_scan = false;
 	return(0);
 }
 

storage/innobase/handler/ha_innodb.h

@@ -177,8 +177,6 @@ class ha_innobase final : public handler
 
 	int extra(ha_extra_function operation) override;
 
-	int extra_opt(ha_extra_function operation, ulong arg) override;
-
 	int reset() override;
 
 	int external_lock(THD *thd, int lock_type) override;

storage/innobase/include/row0mysql.h

@@ -695,11 +695,6 @@ struct row_prebuilt_t {
 	/** The MySQL table object */
 	TABLE*		m_mysql_table;
 
-  bool    full_table_scan; /*!< Whether the full table will need to be
-				  scanned. Set when the sql layer passes NULL cond in
-				  cond_push. Will cause to use X/S locks in select rather than
-				  IX/IS locks */
-
 	/** Get template by dict_table_t::cols[] number */
 	const mysql_row_templ_t* get_template_by_col(ulint col) const
 	{

storage/innobase/row/row0sel.cc

@@ -4718,10 +4718,8 @@ row_search_mvcc(
 		} else {
 wait_table_again:
 			err = lock_table(prebuilt->table, nullptr,
-                       prebuilt->full_table_scan ?
-                       prebuilt->select_lock_type :
-                       (prebuilt->select_lock_type == LOCK_S
-                        ? LOCK_IS : LOCK_IX), thr);
+					 prebuilt->select_lock_type == LOCK_S
+					 ? LOCK_IS : LOCK_IX, thr);
 
 			if (err != DB_SUCCESS) {