From 2b8a41a6c40210c4a2e5c861ca6d0ed61fb1a8d4 Mon Sep 17 00:00:00 2001 From: Venkatesh Duggirala Date: Fri, 9 May 2014 09:52:15 +0530 Subject: [PATCH] Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST, SHOW BINLOGS Fixing post push test failure (MTR does not like giving 127.0.0.1 for localhost incase of --embedded run, it thinks it is an external ip address) --- mysql-test/r/show_processlist.result | 10 +++++----- mysql-test/t/show_processlist.test | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/r/show_processlist.result b/mysql-test/r/show_processlist.result index f133e480e1a..d4a88be3a8e 100644 --- a/mysql-test/r/show_processlist.result +++ b/mysql-test/r/show_processlist.result @@ -1,14 +1,14 @@ Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST, SHOW BINLOGS -connect connection1,127.0.0.1,root,,test,$MASTER_MYPORT,; +connect connection1,localhost,root,,test,$MASTER_MYPORT,; connection default; SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go'; SHOW PROCESSLIST; connection connection1; "Wait_for parked1" SET DEBUG_SYNC='now WAIT_FOR parked1'; -connect connection2,127.0.0.1,root,,test,$MASTER_MYPORT,; -connect connection3,127.0.0.1,root,,test,$MASTER_MYPORT,; +connect connection2,localhost,root,,test,$MASTER_MYPORT,; +connect connection3,localhost,root,,test,$MASTER_MYPORT,; SET DEBUG_SYNC='now SIGNAL go'; connection default; Id User Host db Command Time State Info @@ -21,8 +21,8 @@ SHOW PROCESSLIST; connection connection1; "Wait_for parked1" SET DEBUG_SYNC='now WAIT_FOR parked1'; -connect connection4,127.0.0.1,root,,test,$MASTER_MYPORT,; -connect connection5,127.0.0.1,root,,test,$MASTER_MYPORT,; +connect connection4,localhost,root,,test,$MASTER_MYPORT,; +connect connection5,localhost,root,,test,$MASTER_MYPORT,; SET DEBUG_SYNC='now SIGNAL go'; connection default; Id User Host db Command Time State Info diff --git a/mysql-test/t/show_processlist.test b/mysql-test/t/show_processlist.test index 478c079b95b..47015ab14d1 100644 --- a/mysql-test/t/show_processlist.test +++ b/mysql-test/t/show_processlist.test @@ -10,15 +10,15 @@ --source include/have_debug_sync.inc --source include/count_sessions.inc --enable_connect_log -connect(connection1,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect(connection1,localhost,root,,test,$MASTER_MYPORT,); --connection default SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go'; --send SHOW PROCESSLIST --connection connection1 echo "Wait_for parked1"; SET DEBUG_SYNC='now WAIT_FOR parked1'; -connect(connection2,127.0.0.1,root,,test,$MASTER_MYPORT,); -connect(connection3,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect(connection2,localhost,root,,test,$MASTER_MYPORT,); +connect(connection3,localhost,root,,test,$MASTER_MYPORT,); SET DEBUG_SYNC='now SIGNAL go'; --connection default @@ -36,8 +36,8 @@ SET DEBUG_SYNC='after_one_element_read_from_threads_iterator SIGNAL parked1 WAIT --connection connection1 echo "Wait_for parked1"; SET DEBUG_SYNC='now WAIT_FOR parked1'; -connect(connection4,127.0.0.1,root,,test,$MASTER_MYPORT,); -connect(connection5,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect(connection4,localhost,root,,test,$MASTER_MYPORT,); +connect(connection5,localhost,root,,test,$MASTER_MYPORT,); SET DEBUG_SYNC='now SIGNAL go'; --connection default # This will show 4 connections only ( default + connection 1,2,3 ). Connections