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

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


mysql-test/t/sp.test:
  Auto merged

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;

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|