Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

mysql-test/t/sp.test

@@ -1381,6 +1381,12 @@ show procedure status like '%p%'|
 call ip(200)|
 # We don't want to select the entire table here, just pick a few
 # examples.
+# The expected result is:
+#    i      p
+#   ---   ----
+#    45    211
+#   100    557
+#   199   1229
 select * from primes where i=45 or i=100 or i=199|
 drop table primes|
 drop procedure opp|