bk commit into 5.1 tree (msvensson:1.2534)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-04 17:21:15+01:00, msvensson@stripped +2 -0
  Update skip message 

  mysql-test/t/grant_cache_no_prot.test@stripped, 2007-12-04 17:21:13+01:00, msvensson@stripped +1 -1
    Update skip message 

  mysql-test/t/grant_cache_ps_prot.test@stripped, 2007-12-04 17:21:13+01:00, msvensson@stripped +1 -1
    Update skip message 

diff -Nrup a/mysql-test/t/grant_cache_no_prot.test b/mysql-test/t/grant_cache_no_prot.test
--- a/mysql-test/t/grant_cache_no_prot.test	2007-05-24 22:13:47 +02:00
+++ b/mysql-test/t/grant_cache_no_prot.test	2007-12-04 17:21:13 +01:00
@@ -18,7 +18,7 @@
 if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
             + $VIEW_PROTOCOL > 0`)
 {
-   --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
+   --skip Needs normal protocol
 }
 
 # The main testing script
diff -Nrup a/mysql-test/t/grant_cache_ps_prot.test b/mysql-test/t/grant_cache_ps_prot.test
--- a/mysql-test/t/grant_cache_ps_prot.test	2007-05-24 22:13:47 +02:00
+++ b/mysql-test/t/grant_cache_ps_prot.test	2007-12-04 17:21:13 +01:00
@@ -17,7 +17,7 @@
 if (`SELECT $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0
         OR $PS_PROTOCOL = 0`)
 {
-   --skip Test requires: ps-protocol enabled, other protocols disabled
+   --skip Needs ps protocol
 }
 
 # The main testing script