Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'

phulakun · phulakun · commit bff1f43c9f11 · 2013-10-09T13:34:35.000+05:30
Merging from 5.5 to 5.6
diff --git a/sql/handler.cc b/sql/handler.cc
@@ -6915,8 +6915,14 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
                          "", 0, "DISABLED", 8) ? 1 : 0;
     }
     else
+    {
+      DBUG_EXECUTE_IF("simulate_show_status_failure",
+                      DBUG_SET("+d,simulate_net_write_failure"););
       result= db_type->show_status &&
               db_type->show_status(db_type, thd, stat_print, stat) ? 1 : 0;
+      DBUG_EXECUTE_IF("simulate_show_status_failure",
+                      DBUG_SET("-d,simulate_net_write_failure"););
+    }
   }
 
   if (!result)
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
@@ -286,6 +286,12 @@ my_bool my_net_write(NET *net, const uchar *packet, size_t len)
 
   MYSQL_NET_WRITE_START(len);
 
+  DBUG_EXECUTE_IF("simulate_net_write_failure", {
+                  my_error(ER_NET_ERROR_ON_WRITE, MYF(0));
+                  return 1;
+                  };
+                 );
+
   /*
     Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH
     length. The last packet is always a packet that is < MAX_PACKET_LENGTH.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -12361,6 +12361,7 @@ innodb_show_status(
 	const long		MAX_STATUS_SIZE = 1048576;
 	ulint			trx_list_start = ULINT_UNDEFINED;
 	ulint			trx_list_end = ULINT_UNDEFINED;
+	bool			ret_val;
 
 	DBUG_ENTER("innodb_show_status");
 	DBUG_ASSERT(hton == innodb_hton_ptr);
@@ -12437,12 +12438,13 @@ innodb_show_status(
 
 	mutex_exit(&srv_monitor_file_mutex);
 
-	stat_print(thd, innobase_hton_name, (uint) strlen(innobase_hton_name),
-		   STRING_WITH_LEN(""), str, flen);
+	ret_val= stat_print(thd, innobase_hton_name,
+				(uint) strlen(innobase_hton_name),
+				STRING_WITH_LEN(""), str, flen);
 
 	my_free(str);
 
-	DBUG_RETURN(0);
+	DBUG_RETURN(ret_val);
 }
 
 /************************************************************************//**

Original file line number	Diff line number	Diff line change
`@@ -6915,8 +6915,14 @@ bool ha_show_status(THD thd, handlerton db_type, enum ha_stat_type stat)`
`6915`	`6915`	`"", 0, "DISABLED", 8) ? 1 : 0;`
`6916`	`6916`	`}`
`6917`	`6917`	`else`
	`6918`	`+ {`
	`6919`	`+ DBUG_EXECUTE_IF("simulate_show_status_failure",`
	`6920`	`+ DBUG_SET("+d,simulate_net_write_failure"););`
`6918`	`6921`	`result= db_type->show_status &&`
`6919`	`6922`	`db_type->show_status(db_type, thd, stat_print, stat) ? 1 : 0;`
	`6923`	`+ DBUG_EXECUTE_IF("simulate_show_status_failure",`
	`6924`	`+ DBUG_SET("-d,simulate_net_write_failure"););`
	`6925`	`+ }`
`6920`	`6926`	`}`
`6921`	`6927`
`6922`	`6928`	`if (!result)`