sync rev 76

handler/ha_innodb.cc

@@ -9834,7 +9834,7 @@ TYPELIB innobase_stats_method_typelib=
   innobase_stats_method_names, NULL
 };
 static MYSQL_SYSVAR_ENUM(stats_method, srv_stats_method,
-  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
+  PLUGIN_VAR_RQCMDARG,
   "Specifies how InnoDB index statistics collection code should threat NULLs. "
   "Possible values of name are same to for 'myisam_stats_method'. "
   "This is startup parameter.",

srv/srv0srv.c

@@ -2645,8 +2645,11 @@ srv_master_thread(
 					bpage = UT_LIST_GET_FIRST(buf_pool->flush_list);
 
 					while (bpage != NULL) {
-						level += log_sys->max_checkpoint_age
-							 - (lsn - bpage->oldest_modification);
+						ib_uint64_t	oldest_modification = bpage->oldest_modification;
+						if (oldest_modification != 0) {
+							level += log_sys->max_checkpoint_age
+								 - (lsn - oldest_modification);
+						}
 						bpage = UT_LIST_GET_NEXT(flush_list, bpage);
 					}
 
@@ -2663,7 +2666,7 @@ srv_master_thread(
 					if(bpl)
 						n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST,
 									bpl,
-									IB_ULONGLONG_MAX);
+									oldest_lsn + (lsn - lsn_old));
 
 					/*
 					fprintf(stderr,