From: Bjorn Munch
Date: August 30 2010 9:26am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2927)
List-Archive: http://lists.mysql.com/commits/117122
Message-Id: <201008300926.o7U9Qmkx008458@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1330481125=="

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

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

 2927 Bjorn Munch	2010-08-30 [merge]
      merge 55413

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-25 08:23:19 +0000
+++ b/client/mysqltest.cc	2010-08-30 09:26:40 +0000
@@ -5509,6 +5509,8 @@ int read_line(char *buf, int size)
   char c, UNINIT_VAR(last_quote);
   char *p= buf, *buf_end= buf + size - 1;
   int skip_char= 0;
+  my_bool have_slash= FALSE;
+  
   enum {R_NORMAL, R_Q, R_SLASH_IN_Q,
         R_COMMENT, R_LINE_START} state= R_LINE_START;
   DBUG_ENTER("read_line");
@@ -5580,9 +5582,13 @@ int read_line(char *buf, int size)
       }
       else if (c == '\'' || c == '"' || c == '`')
       {
-        last_quote= c;
-	state= R_Q;
+        if (! have_slash) 
+        {
+	  last_quote= c;
+	  state= R_Q;
+	}
       }
+      have_slash= (c == '\\');
       break;
 
     case R_COMMENT:

=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result	2010-08-04 08:52:45 +0000
+++ b/mysql-test/r/mysqltest.result	2010-08-10 10:13:58 +0000
@@ -262,6 +262,9 @@ a long \$where variable content
 
 banana = banana
 Not a banana: ba\$cat\$cat
+with\`some"escaped\'quotes
+with\`some"escaped\'quotes
+single'tick`backtick
 mysqltest: At line 1: Missing arguments to let
 mysqltest: At line 1: Missing variable name in let
 mysqltest: At line 1: Missing assignment operator in let

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-08-04 08:52:45 +0000
+++ b/mysql-test/t/mysqltest.test	2010-08-10 10:13:58 +0000
@@ -701,6 +701,16 @@ echo banana = $cat;
 let $cat=ba\\\$cat\\\$cat;
 echo Not a banana: $cat;
 
+# Bug #55413 would cause this to fail
+let $escape= with\`some\"escaped\'quotes;
+echo $escape;
+
+--let $escape= with\`some\"escaped\'quotes
+echo $escape;
+
+# This only works with "--let" syntax
+--let $tick= single'tick`backtick
+echo $tick;
 
 # Test illegal uses of let
 


--===============1330481125==
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/testto-51/
# testament_sha1: 3c23f3c315022f4d191c234ad89b9f7d9763be10
# timestamp: 2010-08-30 11:26:48 +0200
# source_branch: file:///home/bm136801/my/letbs-51/
# base_revision_id: bjorn.munch@stripped\
#   hxx5zdsc77g2is60
# 
# Begin bundle
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
L8CwwKLgKAUBr+yi7kinChIB2js7gA==


--===============1330481125==--