Merge mysql.com:/home/jimw/my/mysql-5.0-11570

into mysql.com:/home/jimw/my/mysql-5.0-clean

Merge mysql.com:/home/jimw/my/mysql-5.0-11570
into mysql.com:/home/jimw/my/mysql-5.0-clean
a17fa233 · jimw@mysql.com · 253d528b · 60569555 · a17fa233 · a17fa233
Commit a17fa233 authored Aug 08, 2005 by jimw@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mysql-test/t/sp-threads.test mysql-test/t/sp-threads.test +1 -1

mysql-test/t/sp.test mysql-test/t/sp.test +2 -2

No files found.
--- a/mysql-test/t/sp-threads.test
+++ b/mysql-test/t/sp-threads.test
@@ -75,7 +75,7 @@ send call bug9486();
 connection con2root;
 --sleep 2
 # There should be call statement in locked state.
--replace_column 1 # 6 #
+--replace_column 1 # 3 localhost 6 #
 show processlist;
 unlock tables;
 connection con1root;

--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -2542,9 +2542,9 @@ create procedure bug4902_2()
 begin
  show processlist;
 end|
--replace_column 1 # 6 #
+--replace_column 1 # 6 # 3 localhost
 call bug4902_2()|
--replace_column 1 # 6 #
+--replace_column 1 # 6 # 3 localhost
 call bug4902_2()|
 drop procedure bug4902_2|