Revert "Porting secondary index to 5.6"

Summary:
Resolve #740. Scans of
secondary indexes are slowed by the updates to the global counter.

Reviewed By: mdcallag

Differential Revision: D6105114

fbshipit-source-id: 81472cf

storage/innobase/handler/ha_innodb.cc

@@ -1031,10 +1031,6 @@ static SHOW_VAR innodb_status_variables[]= {
   (char*) &export_vars.innodb_rwlock_x_spin_rounds,	  SHOW_LONG},
   {"rwlock_x_spin_waits",
   (char*) &export_vars.innodb_rwlock_x_spin_waits,	  SHOW_LONG},
-  {"secondary_index_record_read_check",
-  (char*) &export_vars.innodb_sec_rec_read_check,	  SHOW_LONG},
-  {"secondary_index_record_read_sees",
-  (char*) &export_vars.innodb_sec_rec_read_sees,	  SHOW_LONG},
   {"secondary_index_triggered_cluster_reads",
   (char*) &export_vars.innodb_sec_rec_cluster_reads,	  SHOW_LONG},
   {"secondary_index_triggered_cluster_reads_avoided",

storage/innobase/include/srv0srv.h

@@ -635,11 +635,6 @@ extern ulint srv_n_rollback_total;
 /** Number of partial rollbacks */
 extern ulint srv_n_rollback_partial;
 
-/** Number of times secondary index block visibility check returned TRUE */
-extern ulint srv_sec_rec_read_sees;
-/** Number of times secondary index block visibility check was done */
-extern ulint srv_sec_rec_read_check;
-
 /** Number of times secondary index lookup triggered cluster lookup */
 extern atomic_stat<ulint>	srv_sec_rec_cluster_reads;
 /** Number of times prefix optimization avoided triggering cluster lookup */
@@ -1220,9 +1215,6 @@ struct export_var_t{
 	ulint innodb_trx_n_rollback_partial;	/*!< srv_n_rollback_partial */
 	ulint innodb_trx_n_rollback_total;	/*!< srv_n_rollback_total */
 
-	ulint innodb_sec_rec_read_sees;		/*!< srv_sec_rec_read_sees */
-	ulint innodb_sec_rec_read_check;	/*!< srv_sec_rec_read_check */
-
 	ulint innodb_sec_rec_cluster_reads;	/*!< srv_sec_rec_cluster_reads */
 	ulint innodb_sec_rec_cluster_reads_avoided; /*!< srv_sec_rec_cluster_reads_avoided */
 

storage/innobase/lock/lock0lock.cc

@@ -570,7 +570,6 @@ lock_sec_rec_cons_read_sees(
 	const read_view_t*	view)	/*!< in: consistent read view */
 {
 	trx_id_t	max_trx_id;
-	bool		result;
 
 	ut_ad(page_rec_is_user_rec(rec));
 
@@ -585,12 +584,7 @@ lock_sec_rec_cons_read_sees(
 	max_trx_id = page_get_max_trx_id(page_align(rec));
 	ut_ad(max_trx_id);
 
-	result = (max_trx_id < view->up_limit_id);
-
-	srv_sec_rec_read_check++;
-	srv_sec_rec_read_sees += result;
-
-	return result;
+	return(max_trx_id < view->up_limit_id);
 }
 
 /*********************************************************************//**

storage/innobase/srv/srv0srv.cc

@@ -600,12 +600,6 @@ ulint	srv_n_commit_with_undo	= 0;
 ulint	srv_n_rollback_total	= 0;
 ulint	srv_n_rollback_partial	= 0;
 
-/** Number of times secondary index block visibility check returned TRUE */
-ulint	srv_sec_rec_read_sees	= 0;
-
-/** Number of times secondary index block visibility check was done */
-ulint	srv_sec_rec_read_check	= 0;
-
 /** Number of times secondary index lookup triggered cluster lookup */
 atomic_stat<ulint>	srv_sec_rec_cluster_reads;
 
@@ -2040,9 +2034,6 @@ srv_export_innodb_status(void)
 	export_vars.innodb_trx_n_rollback_partial= srv_n_rollback_partial;
 	export_vars.innodb_trx_n_rollback_total= srv_n_rollback_total;
 
-	export_vars.innodb_sec_rec_read_sees = srv_sec_rec_read_sees;
-	export_vars.innodb_sec_rec_read_check = srv_sec_rec_read_check;
-
 	export_vars.innodb_sec_rec_cluster_reads =
 		srv_sec_rec_cluster_reads.load();
 	export_vars.innodb_sec_rec_cluster_reads_avoided =