bzr commit into mysql-5.5-mtr branch (bjorn.munch:3184)

[Bjorn Munch]

#At file:///home/bm136801/my/mtr-55/ based on revid:bjorn.munch@stripped

 3184 Bjorn Munch	2011-03-18 [merge]
      upmerge 11885854

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-01-26 18:33:53 +0000
+++ b/client/mysqltest.cc	2011-03-18 14:42:58 +0000
@@ -8334,13 +8334,15 @@ int main(int argc, char **argv)
   }
   var_set_string("MYSQLTEST_FILE", cur_file->file_name);
   init_re();
+
+  /* Cursor protcol implies ps protocol */
+  if (cursor_protocol)
+    ps_protocol= 1;
+
   ps_protocol_enabled= ps_protocol;
   sp_protocol_enabled= sp_protocol;
   view_protocol_enabled= view_protocol;
   cursor_protocol_enabled= cursor_protocol;
-  /* Cursor protcol implies ps protocol */
-  if (cursor_protocol_enabled)
-    ps_protocol_enabled= 1;
 
   st_connection *con= connections;
 #ifdef EMBEDDED_LIBRARY

No bundle (reason: revision is a merge).