Commit f707f718 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/ps.test:
  Manual merge.
parents d65ae804 636a5b3f

mysql-test/t/ps.test

+0 −4
Original line number Diff line number Diff line
@@ -1119,10 +1119,6 @@ DEALLOCATE PREPARE stmt; 
DROP TABLE t1;





--echo End of 4.1 tests.







############################# 5.0 tests start ################################

#

#