3 files changed, 0 insertions, 105 deletions
diff --git a/mysql-test/r/mdev-504.result b/mysql-test/r/mdev-504.result
deleted file mode 100644
index 9b8b6795e0f..00000000000
--- a/mysql-test/r/mdev-504.result
+++ /dev/null
@@ -1,24 +0,0 @@
-SET GLOBAL net_write_timeout = 900;
-CREATE TABLE A (
-pk INTEGER AUTO_INCREMENT PRIMARY KEY,
-fdate DATE
-) ENGINE=MyISAM;
-CREATE PROCEDURE p_analyze()
-BEGIN
-DECLARE attempts INTEGER DEFAULT 100;
-wl_loop: WHILE attempts > 0 DO
-ANALYZE TABLE A;
-SET attempts = attempts - 1;
-END WHILE wl_loop;
-END |
-CREATE FUNCTION rnd3() RETURNS INT
-BEGIN
-RETURN ROUND(3 * RAND() + 0.5);
-END |
-SET GLOBAL use_stat_tables = PREFERABLY;
-connection default;
-DROP TABLE A;
-DROP PROCEDURE p_analyze;
-DROP FUNCTION rnd3;
-SET GLOBAL use_stat_tables = DEFAULT;
-SET GLOBAL net_write_timeout = DEFAULT;
diff --git a/mysql-test/t/mdev-504.test b/mysql-test/t/mdev-504.test
deleted file mode 100644
index 551c21c37d0..00000000000
--- a/mysql-test/t/mdev-504.test
+++ /dev/null
@@ -1,80 +0,0 @@
---source include/not_valgrind.inc
---source include/no_protocol.inc
-
-SET GLOBAL net_write_timeout = 900; 
-
-CREATE TABLE A (
-  pk INTEGER AUTO_INCREMENT PRIMARY KEY,
-  fdate DATE
-) ENGINE=MyISAM;
-
---delimiter |
-
-CREATE PROCEDURE p_analyze()
-BEGIN
-  DECLARE attempts INTEGER DEFAULT 100;
-  wl_loop: WHILE attempts > 0 DO
-    ANALYZE TABLE A;
-    SET attempts = attempts - 1;
-  END WHILE wl_loop;
-END |
-
-CREATE FUNCTION rnd3() RETURNS INT
-BEGIN
-  RETURN ROUND(3 * RAND() + 0.5);
-END |
-
---delimiter ;
-
-SET GLOBAL use_stat_tables = PREFERABLY;  
-
---let $trial = 100
-
---disable_query_log
---disable_result_log
---disable_warnings
-while ($trial)
-{
-
-  --connect (con1,localhost,root,,)
-  --send CALL p_analyze()
-
-  --connect (con2,localhost,root,,)
-  --send CALL p_analyze()
-
-  --let $run = 100
-
-  while ($run)
-  {
-    --connect (con3,localhost,root,,)
-  
-    let $query = `SELECT CASE rnd3() 
-      WHEN 1 THEN 'INSERT INTO A (pk) VALUES (NULL)'
-      WHEN 2 THEN 'DELETE FROM A LIMIT 1'
-      ELSE 'UPDATE IGNORE A SET fdate = 2 LIMIT 1' END`;
-    --eval $query
-    --disconnect con3
-    --dec $run
-  }
-
-  --connection con2
-  --reap
-  --disconnect con2
-  --connection con1
-  --reap
-  --disconnect con1
-
-  --dec $trial
-}
-
---enable_query_log
---enable_result_log
---enable_warnings
-
-# Cleanup
---connection default
-DROP TABLE A;
-DROP PROCEDURE p_analyze;
-DROP FUNCTION rnd3;
-SET GLOBAL use_stat_tables = DEFAULT;
-SET GLOBAL net_write_timeout = DEFAULT;
diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests
index 286c99cba14..7307a5ad3c9 100644
--- a/mysql-test/unstable-tests
+++ b/mysql-test/unstable-tests
@@ -77,7 +77,6 @@ main.lock_tables_lost_commit          : MDEV-24624 - Timeout
 main.lock_view                        : Modified in 10.2.37
 main.log_slow                         : MDEV-13263 - Wrong result
 main.log_tables-big                   : MDEV-13408 - wrong result
-main.mdev-504                         : MDEV-15171 - warning
 main.mdev375                          : MDEV-10607 - sporadic "can't connect"
 main.merge                            : MDEV-10607 - sporadic "can't connect"
 main.myisam                           : Modified in 10.2.37