From: Bjorn Munch
Date: December 9 2010 1:44pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2959) Bug#58511
List-Archive: http://lists.mysql.com/commits/126423
X-Bug: 58511
Message-Id: <201012091344.oB9DiQHB003523@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1595611883=="

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

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

 2959 Bjorn Munch	2010-12-09
      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-12-09 13:42:04 +0000
+++ b/client/mysqltest.cc	2010-12-09 13:43:42 +0000
@@ -7640,6 +7640,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)


--===============1595611883==
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/rcvcp-51/
# testament_sha1: 12248b8ffed8e733667aafea36cff0c22633a105
# timestamp: 2010-12-09 14:44:26 +0100
# base_revision_id: bjorn.munch@stripped\
#   p20fe8gow5dbh7tv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUnMDc0AAcjfgFAQef///1MC
CAq////6UAQmXtCoxWre1u1wlIEnoFPITxNMmUwmKepsmp4UeoYgeoc0xMBGmBGEYAAAAmEYDQmj
UZTGlNhNNKPKM1NPRlMQyDNQAMUChqeaKabU2o0NGEYhhNMQyaB6gkkTKegTR6mJkJHlGjRp6R6g
AAMmNqGK8X9rT1qzd++ehSsi5GLwF7FWYgPjDnYtyl8tGNEGKQUIS87dZ4zQ+7PJb+n+Zf1qUKV7
dilsrFLzUa2C2dupDTWMTS7e7sXnj536qpUJ+YnVIc/BFF+pLMnVUhnCbOCu5aYBzNNjHwxfndll
04zjYHyQE6Zw9aCsHMGBv1buGGAiarBratHeUS91J8CHjZ4TspKy+wTkFsGKq3g1MSISIhBbcE+m
HVd44iZtJYPO1hw8Q5Ij+Hg8mQHiFpKXn83ueBkCWRBT2QBF1PG8ZcOSOgCFBMnRbpjPmUBQwti+
h4rJB1ctD9hLGWRfe85GWtUMB8gTBUIiEC/HvLd5gbu8q21bJ0JnGDwsudzFOybqiEeA1BcQdAcV
k4ioSMsdO6kkZtSElW2tmhBInk4T/AucaKkNMfRkO9N9lXBxfqHhg8lQfWOYX2cRazbAVRF9ry0B
Wfg8NOZNSHnVcEQ8ykMHjTGJSOiI6w8B8qo9H03Zh1iiSGUTYIfybBjhjfMsslaPxvJCsaqlW9CE
50GH7DfBAqEawR4YBWPkOK2+I7x7LON3Y6xyCgdfd3biIQ0GRjnyDnUUVCV8SqrpPagHbWowQDB9
2fVfxEyIQpht0PA7bp2LY0iCLajITKE4dNY9/QhHDhCsLCsUv2U4sDXvNg7MzTJ38H0UCgSvl0mh
a9aIcZEQcc1E3rHd2FnCNF7KdGoncjU4ruE3rcl7gb9B5HR77DvQRvjwmrbNBdBACVfKqTS0aE+7
djaaFxRAubQMxsc5rIQzR2W+ZwWN2ujYfh+EFQ/pXDKKHWSISW4Nu6rvhuImoKgrIwrcjuL0FUhk
LCjTmu05WZMwPN75Tnx6+IxBmb1KtFfQPKHnBgW8GMil2oXTs7BaLk8jzE/z1orzz4N9ANPOXKk+
AgTRAE0m/LS1+MITaD5Y9Z/dE4C3C9u9I6WcDHPSHXRts3hxuB7w40EUhikJudi/aQofwIhiVImD
WSg9cg9WBMI0MNfeRD1VtmMNYMYysCm5gnEhGy98UAaEmgJ4YJGguRagMu08hAVYpleZigJIt7oH
+SMArVQL1vWrlCnOB7TxVJ5QFDpSLhJLT5QghPkhaIoqqTCwo8hJwyNFiDs3Cj2nEUkhgFFaaXG9
7Ayk+AyzOwEsqasj0q8JYQW9LHlvRUcqHIdCoSJIwl6emdSnDsEFH5kLODLXhoDyxk3YHCtPDUaY
d5EQkHdU047ZCLJRKSckn5hX6ZCLVphO9SINdPLqzlRhoDEj2htFhTEMS7KYnNpBbPzMSFO0wNz0
ZnM2GELS3uI3FIpn/F3JFOFCQScwNzQ=


--===============1595611883==--