Commit c4187de6 authored by unknown's avatar unknown
Browse files

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
parents 05071ff4 3815b5ad

mysql-test/t/sp-threads.test

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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|