From: Bjorn Munch
Date: March 18 2011 11:15am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2988) Bug#11885854
List-Archive: http://lists.mysql.com/commits/133288
X-Bug: 11885854
Message-Id: <201103181116.p2IBG0MH004475@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1940589348=="

--===============1940589348==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 2988 Bjorn Munch	2011-03-18
      Bug #11885854 MYSQLTEST: PS-PROTOCOL IMPLIED BY CURSOR-PROTOCOL LOST AFTER ENABLE_PS_PROTOCOL 
      The condition cursor-protocol => ps-protocol was done at "current setting" level"
      Moved it to "set by command line" level

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-01-26 15:34:34 +0000
+++ b/client/mysqltest.cc	2011-03-18 11:13:54 +0000
@@ -8032,13 +8032,15 @@ int main(int argc, char **argv)
     cur_file->lineno= 1;
   }
   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;
   if (!( mysql_init(&con->mysql)))


--===============1940589348==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/cpps-51/
# testament_sha1: 73274c068011f58a414a1e118d182858c29f86cc
# timestamp: 2011-03-18 12:16:00 +0100
# base_revision_id: bjorn.munch@stripped\
#   j21jr5fd7lxxji7x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdy4uS4AAaTfgEAQWHP//38n
/iC////wUAP0ebiWuOnDO3BJKAmJMaGTIT0MqeGqYh4mibUxPU9Q0DKCYSemkwCT1GQDTQAaBpoA
NBohpHqnk0o8g0aQDQBo0aGgA009Qc0xMmTRhMExNMAmAQwRgRgEkjSamJlT2U0jbVGbUeqemptT
MoAyNBkAm2iOQM11jTJbFlKwxd0ZmgXIA1NCVJuVOziQFH5x+NE92Hs5ZmGY9uZI9cGw1V6YXyZo
Yed7jbyr40Ekuzni+HHurnu9Tf9jKM3VmuGx0kYaAySVVVdj9lehOMYGZhlHn1uxHQRel/GWakVE
G4sWM1ZZJ4p2iVCQ/IIqwjlx/I8lRW5tM5scoYieIpCIlwyDBEqdRAgvyTL1NQIxJPmvFAT57EQ1
zCXQyDmMNsgDQKQuyVFxXNhFDq8UoNgPwe8/UHmk3oGYX9ygcWXGJKGSBM0H2QUFOLFpAJoUV4dZ
XDK4ILX3CehBmF9gCxSQkh3ycDADLWuBHUr8t54LBiE5EYaW3lZOZ2oyf+CSxhLd9IgHYK8IWaGY
EmQVWUKyBNMrG7sA5cdYJCtpDmzFgjnqXIaKxgHwilRaoXVEUxcWT0HALlbKaE1DEHQQL1h7sm0u
yLjYIBqjE7BKX5CEAwrsvW8KTNVg0LFrDYLlwMOGK8IyFfczagKKWgQdfcim9jWhGEbzQTAPmNKO
8z7LJbdMWJ49m/fPrEeE6bGTHfH7854qJGjwjgfLM0Zrm/G7J2ROF4tZaoai2XaArHrTIrjX3cjn
i6KFTKqmZbN7CRx8TM8MG04bt/f5xJDhHG6HC7dds8YkeUNT4b5t4432ilOG+a1d54DOf1r2hFHo
ZjkQSEr3Ig/2C+cc4KjGzJHh1KmUaRiwMz4p3fj9FZd86LMfpLAseEhVKjfgUMFg98Tsz2SJ1JQA
fWl2WldURToz1VIwTNMBPva5IXLzToXU0Z3M2zq4d1LECZT2TYnfftuGR9M+ThEDye6QNKUKXFt1
PP5zcnSkgaMtzV5mNpa6xrRcQpw0c4dcayGiYXRZXa3d9U3KSv5zix5FIkRCi193mvd+MMg6avUK
3LQTsgtS6+GsRT0LHXk1nnwDh7Md4MzBTeF8Qd6khik0keqGzDH0qu5VpGqtctLWDyHcfkEYHCOa
YwhgtspYQ0gcZmJwuSiyZbjLEVWlIJBxtDV6+mgYdhIcA8yEjIosmQRptearUIKgxDq5+ZjRWMoS
1Gy1wOPQyJvnDSwpAA4KZCI5pg6KJQ8E1rgTT1goKZ4EEaYZEEydUOVGWhlZytANRaaxJdJ7haBK
fOwGdGe4i8WK1ATx6h+KFuSvGnJ9FZCqckUhUE2T9yS7bfHtOnSIkq8mNRIX2LyYLCVlP2mE3bFo
yqJZVXTYx9RXyknUhaTGSvNhL/cQ4j/i7kinChIblxclwA==


--===============1940589348==--