Commit b7033fb3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/opt/local/work/mysql-4.1-11458 

into  mysql.com:/opt/local/work/mysql-5.0-root


configure.in:
  Manual merge
mysql-test/r/ps.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
parents 51ce56e6 e064ca31

mysql-test/r/ps.result

+2 −0
Original line number Diff line number Diff line
@@ -738,3 +738,5 @@ execute stmt using @user_id, @id; 
partner_id

execute stmt using @user_id, @id;

partner_id

deallocate prepare stmt;

drop table t1, t2, t3, t4;