From: Bjorn Munch
Date: November 29 2010 11:10am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2956) Bug#58511
List-Archive: http://lists.mysql.com/commits/125319
X-Bug: 58511
Message-Id: <201011291111.oATBB0dZ028621@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0127469377=="

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

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

 2956 Bjorn Munch	2010-11-29
      Bug #58511 mysqltest doesn't always run statements in ps mode
      mysqltest checks if the stmt is one that should be run in ps mode,
       but regexp doesn't match if preceeded by /* */ comment.
      Fix: match function will jump over /*..*/ if found at start

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-11-17 15:05:52 +0000
+++ b/client/mysqltest.cc	2010-11-29 11:06:37 +0000
@@ -7638,6 +7638,16 @@ void init_re(void)
 
 int match_re(my_regex_t *re, char *str)
 {
+  while (my_isspace(charset_info, *str))
+    str++;
+  if (str[0] == '/' && str[1] == '*')
+  {
+    char *comm_end= strstr (str, "*/");
+    if (! comm_end)
+      die("Statement is unterminated comment");
+    str= comm_end + 2;
+  }
+  
   int err= my_regexec(re, str, (size_t)0, NULL, 0);
 
   if (err == 0)


--===============0127469377==
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/commps-51/
# testament_sha1: b79e8a054c6b821c22d4c23f38362c4aa3237133
# timestamp: 2010-11-29 12:11:00 +0100
# base_revision_id: bjorn.munch@stripped\
#   74opxo7davkjp4xh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ02j3oAAc9fgFAQef///1MC
CAq////6UARGvd6PR62T2Xqe9vBKIRkhglPwSnqemak0/Uj1PaKeU2p6QzUD1BJIRppkFPE0Inkj
TQeoaNGgABoGk0GiGhJ4p4nqRoAaGgGgaaA0GKR6QE9T1R6jajT1NB4oGgAA0ABJKHqj1MoPFGE9
pQ9EDNQAAAAahTrGdOHAs1du3fUqrlYy16N1+2kDrqvbkjc2a/OiDVQVAzfXTgVUSerdbIeX+b3c
86ir6eZY6Vqs2rgqM8+ZCEpco7OVfSzZu67b45Xn9TKpnGzvNguwOrFcYBFitFhi9Njg176Hqb7Y
tNWiTjZPkmSLKxBs6x9zCYV4oYW7NtdZkcuHkmkT3TycuM+BG1qFZYqa3c0xLrXry2wmVSROkOtd
E+VRHjwrDzsOe7AoPOTDh4hyRkWO9wnQlALxYH3VFj6oPX2DeDNAQRZaJgThFgcRDOObWeDYIjXG
aepq1wq8dCzL8L5mVNda9CmHg6vzApvv5i/XWQnmY/5AnV694/UuWbLny7x+7ZCcEGDBS7+YUHi1
wgR22ijnN9BXdCsk8XlqIJzE93NGX+LuFlSG1JmYTIZYliK3Psun3mjI5YEsjBAa0pK0VB9yCqIe
GPBxbW4VqGHxhhAjfhcukyKsSZRnitMXsO47dFM4G0bfnSVL8ZK+txs5J2kfERt2aaTvcVxznK+l
ZZgsh6T1rndkNzRnEn2tvAnnepjkWZD5tCjityatoEQjeuJudPyPoX1/Pvm+TmqQNfDhvRCPMqKd
e4a2EJTNXarr5N2ODtvgMG6W8PD16HQcjFIiUlSAejPHCGHVMgbNw0MkYDpLTycy7K4YgSGIUexT
BICGkc4sF4j1tcOXtNVUKCXevOeDnsRDflRCI8lM5k+4pjIjNl5ZfVxohBKB6XHg4jS4uSJmBLu4
mbNH1wO1pLDAfYVeOeITIiAEyKYUA9Da7xwHB4CcWg6EjhDNJkcsFNmseIKo+jDgVA2lOLpjVqIz
I67Uz6jzQkJmEFOvE4Hpg4ndsCGpNBtlMTAX23WDHCzNes6I3AGQGKzwISydXBgvlSBJoJtt6LV7
n7vYDjZ8LkpeRpqjCfNu0WuhUEJDwCSV1J/X5+juW1EKUxl1FmicKE5xWzaQvpBrQvcRogxOSZ5c
z3Ig+lIzLEVDUIdiYaNA97wSgUYoDXdZI3ss+4O2EK3BZLApSQjMzQQBilIAmDhRIFMylYGWo0HG
qiiJlEGFGvjctX4kZAoXMC55Tr4tu1Rj1Aq01FNckZRTXm0veg95nv2KKSKgY59tOLt8FBxpJOE+
SYiGiQT4KsUFyANMtFEiZpgjBnl/BnPtspz8XF1JA6xcbDp7mncjsKpMK1TC7u9XWzVBqOt10CXY
vfaFgNIzjnDBtU0LUVztBCkKUGSjUOiYicolJSox2ue0UY3zj+zEiVstfDiOkG0PiU4Cw6SvIMxU
16SwdDoI3FMEcFFfipXSXFLUORuNRdFMYyzj6Ss/4u5IpwoSAabR70A=


--===============0127469377==--