srv0srv.c:

  Eliminate potential division by zero

1 files changed, 8 insertions, 3 deletions

diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
index 81b3333cbe8..5d9d6a77b12 100644
--- a/innobase/srv/srv0srv.c
+++ b/innobase/srv/srv0srv.c
@@ -2148,7 +2148,12 @@ srv_sprintf_innodb_monitor(
 
 	current_time = time(NULL);
 
-	time_elapsed = difftime(current_time, srv_last_monitor_time);
+	/* We add 0.001 seconds to time_elapsed to prevent division
+	by zero if two users happen to call SHOW INNODB STATUS at the same
+	time */
+	
+	time_elapsed = difftime(current_time, srv_last_monitor_time)
+			+ 0.001;
 
 	srv_last_monitor_time = time(NULL);
 
@@ -2443,13 +2448,13 @@ loop:
 	srv_error_monitor_active = TRUE;
 
 	os_thread_sleep(10000000);
-	/*
+
 	printf("Validating has index\n");
 
 	btr_search_validate();
 
 	printf("Hash index validated\n");
-	*/
+
 	sync_array_print_long_waits();
 
 	/* Flush stdout and stderr so that a database user gets their output