From: Bjorn Munch
Date: November 17 2010 3:07pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2951) Bug#58257
List-Archive: http://lists.mysql.com/commits/124166
X-Bug: 58257
Message-Id: <201011171507.oAHF7639003261@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0470001323=="

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

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

 2951 Bjorn Munch	2010-11-17
      Bug #58257 mysqltest: in if(), ! $var with space is always false
      Evaluation would start with the space and thus ignore the $
      Added while() to skip past white space

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-11-15 13:23:02 +0000
+++ b/client/mysqltest.cc	2010-11-17 15:05:52 +0000
@@ -5434,7 +5434,9 @@ void do_block(enum block_cmd cmd, struct
   if (*expr_start == '!')
   {
     not_expr= TRUE;
-    expr_start++; /* Step past the '!' */
+    expr_start++; /* Step past the '!', then any whitespace */
+    while (*expr_start && my_isspace(charset_info, *expr_start))
+      expr_start++;
   }
   /* Find ending ')' */
   expr_end= strrchr(expr_start, ')');

=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result	2010-11-15 13:23:02 +0000
+++ b/mysql-test/r/mysqltest.result	2010-11-17 15:05:52 +0000
@@ -402,7 +402,9 @@ true-inner
 true-inner again
 true-outer
 Counter is greater than 0, (counter=10)
+Counter should still be 10, is 10
 Counter is not 0, (counter=0)
+Not space var works
 Counter is true, (counter=alpha)
 Beta is true
 while with string, only once

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-11-15 13:23:02 +0000
+++ b/mysql-test/t/mysqltest.test	2010-11-17 15:05:52 +0000
@@ -1138,6 +1138,11 @@ if (!$counter)
 {
   echo Counter is not 0, (counter=10);
 }
+if (! $counter)
+{
+  let $counter=5;
+}
+echo Counter should still be 10, is $counter;
 let $counter=0;
 if($counter)
 {
@@ -1147,6 +1152,10 @@ if (!$counter)
 {
   echo Counter is not 0, (counter=0);
 }
+if (! $counter)
+{
+  echo Not space var works;
+}
 
 # ----------------------------------------------------------------------------
 # Test if with some non-numerics


--===============0470001323==
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/notspc-51/
# testament_sha1: 325cd83bbdb4c984560e519c5a506fbc5a84ae3b
# timestamp: 2010-11-17 16:07:05 +0100
# base_revision_id: bjorn.munch@stripped\
#   sy0fncw2tslxns4y
# 
# Begin bundle
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
kKgvyEo=


--===============0470001323==--