From: Bjorn Munch
Date: November 18 2010 3:41pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3117)
List-Archive: http://lists.mysql.com/commits/124297
Message-Id: <201011181541.oAIFfu3T029562@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

 3117 Bjorn Munch	2010-11-18 [merge]
      upmerge 58257

    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-17 10:18:52 +0000
+++ b/client/mysqltest.cc	2010-11-18 15:41:35 +0000
@@ -5628,7 +5628,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-17 10:18:52 +0000
+++ b/mysql-test/r/mysqltest.result	2010-11-18 15:41:35 +0000
@@ -403,7 +403,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)
 while with string, only once
 5<7

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-11-17 10:18:52 +0000
+++ b/mysql-test/t/mysqltest.test	2010-11-18 15:41:35 +0000
@@ -1141,6 +1141,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)
 {
@@ -1150,6 +1155,10 @@ if (!$counter)
 {
   echo Counter is not 0, (counter=0);
 }
+if (! $counter)
+{
+  echo Not space var works;
+}
 
 # ----------------------------------------------------------------------------
 # Test if with some non-numerics

No bundle (reason: revision is a merge).