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.

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.
8b40b127 · unknown · 6406295b · 384179c5 · 8b40b127
Commit 8b40b127 authored Jan 19, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

mysql-test/t/ps.test mysql-test/t/ps.test +0 -4

No files found.
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -1119,10 +1119,6 @@ DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
--echo End of 4.1 tests.
 ############################# 5.0 tests start ################################
 #
 #