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.
This commit is contained in:
unknown 2007-01-19 09:03:32 -05:00
commit f707f71814

View file

@ -1119,10 +1119,6 @@ DEALLOCATE PREPARE stmt;
DROP TABLE t1;
--echo End of 4.1 tests.
############################# 5.0 tests start ################################
#
#