diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 64de3d19882..13f5d2606a9 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -457,6 +457,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res,
                 NULL);
 
   my_close(fd, MYF(0));
+  my_delete(query_file_path, MYF(0));
 
   DBUG_RETURN(ret);
 }
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 4a278cd4aec..2cfbe7aadcb 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -5748,6 +5748,7 @@ bug23760_rc_test(ROW_COUNT())
 DROP TABLE bug23760, bug23760_log|
 DROP PROCEDURE bug23760_update_log|
 DROP PROCEDURE bug23760_test_row_count|
+DROP PROCEDURE bug23760_test_row_count2|
 DROP FUNCTION bug23760_rc_test|
 DROP PROCEDURE IF EXISTS bug24117|
 DROP TABLE IF EXISTS t3|
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 46a1b1dc740..0b3dd89f3fa 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -6715,6 +6715,7 @@ SELECT bug23760_rc_test(ROW_COUNT())|
 DROP TABLE bug23760, bug23760_log|
 DROP PROCEDURE bug23760_update_log|
 DROP PROCEDURE bug23760_test_row_count|
+DROP PROCEDURE bug23760_test_row_count2|
 DROP FUNCTION bug23760_rc_test|
 
 #