From: Bjorn Munch Date: April 14 2011 11:00am Subject: bzr commit into mysql-5.1 branch (bjorn.munch:3658) Bug#12360195 List-Archive: http://lists.mysql.com/commits/135430 X-Bug: 12360195 Message-Id: <201104141100.p3EB0a7E004377@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0090473169==" --===============0090473169== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/23533-51/ based on revid:serge.kozlov@stripped 3658 Bjorn Munch 2011-04-14 Bug #12360195 MTR DOES NOT IGNORE TABS IN EXPERIMENTAL FILE Instead of just filtering space, filter white space (\s) I left the default.experimental file as is, with tabs. modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2011-02-09 08:30:44 +0000 +++ b/mysql-test/mysql-test-run.pl 2011-04-14 10:59:06 +0000 @@ -1123,7 +1123,7 @@ sub command_line_setup { chomp; # remove comments (# foo) at the beginning of the line, or after a # blank at the end of the line - s/( +|^)#.*$//; + s/(\s+|^)#.*$//; # If @ platform specifier given, use this entry only if it contains # @ or @! where xxx != platform if (/\@.*/) @@ -1134,8 +1134,8 @@ sub command_line_setup { s/\@.*$//; } # remove whitespace - s/^ +//; - s/ +$//; + s/^\s+//; + s/\s+$//; # if nothing left, don't need to remember this line if ( $_ eq "" ) { next; --===============0090473169== 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/23533-51/ # testament_sha1: b4545fb95572c57aeab8e84034ad4bc17888e783 # timestamp: 2011-04-14 13:00:36 +0200 # base_revision_id: serge.kozlov@stripped\ # ghrxsnitso1ogg50 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWTR/O0AAZvfgAAwXH///3en 3EW////0UAPjBhZpXjvdd2hkgkybSnqn6MU9TYRT8U9U9Qyek0/U00nqPKHigA0QkemmQ00U9T0Z E0A00GTQAAMhoElNAp6CaanpkSemoHqbKA9I9QA0AAA2pRNqnkmxI09TAjQG1D0CZGgxAZNNNBKJ TU/Sam8qeo/Samm0mam9SbUyAA0AAAaIY+ySioLHGYCfIEjWluUgTUClfZofWrd5ul2voEQcd55s egRRUgc1FfTx8NmOOeJU0h45u3Nx/nDp9vN9nRRhpmWIWunhrj1MXD4hSE+vX3d6tiaXcMFGFIrg YxyBEcBslo0ChYppUWcdT7kifSysETx6jJZQI2z5uEgxcnaXv4oTRGVz3s3gcXjkEJsLiJkzZGap QUOXAo6HJK1Ld54PTkFBXdg6OesRNGiEZmyinpVcUxA+ieL2H3pgUMC+lXcisTg0S3PZr06nnJZa zQ4RNVzLrCt225lORPYaK5BLXWXi7q2Vc71N1pTZrZarNDonZneOmX2sNQuRqh+rrBOhFOwSEAZE DM64rXhcRnUJZhHOJVirEv8CRNeZmLC4CiY5p8ZJYiR4K+Wsa8eEXTvCwUwa6pKZqoineVofPKl2 PZviuaIbqGPVamWUm7YgDQHkykCCCNFAvBQubnkU1YdU4FWkEqW4YkSssEA0QkGBSZKjpVCk4xlg 0mYgydK5NEzBPM7esfWeHDPla9h3DN4twb0cRDkKBOGN4j27nvxz5vD0hVyfUtzQsJzVFz4DpI5t 6KyPRs5de9X+XXZOR6aFhANwN+A92QIsXd+vHKNfkdhIy9yRrAvaXoTKshZlLTdRBPQIHWOUHm1O QewMFeUhHnGiItC8Q+YLcWDyDtBApmapCRvJElgXbm0wubn64IYjAUUbbRZBPpE2RHxVtvS7UxZI 3FLGRtDc/aGURVjVe6p3UiluAyCKfJO6yYkX44WtgdOpA4RR3EgqKG0oyAYEH4WMUDMRgSWXMLa5 hWKrtMkraA8KPUOrCpRpQXZUwZoM05uIelPgklGPaWo/hQYBhCSbS9Ka7oWmlDyE+lFe3AXC+CqW 5C95A+SXkqhqUBbyBmpgkW7bDEZjjyIkXXi+FrKEbEx4gnCdgaxqogrldXnubOWKSsUejt8SxEK0 pLoca/kSjExS2+Tes9VdHJPTG03MYwsclMOJFilolT/rbQ8wxPAYUSokaTAcqRCqGVty/gVCUcZG ALWHNPWbgZDXKZ0EtaIWDDLYYqXn/gEA12SgTjw3wJ4BRddVQjm7GTwKdFilVxJzpnKgfKkG5Lml 3FyamWCDlnmBWnKtSKmfoWk4rAdhVIvBhIMu6+61hCD85St8r4tO5xzOJjpNTLbaUCsHD2UweYdV 1OnMeXUENLtiUaVQmE8iVQ3cKORO4k0gww+rUyLsSXbGwfkTzqr8f8XckU4UJBk0fztA --===============0090473169==--