Bug #58412 mysqltest: allow quoting of strings in let and in if comparison

Stripping quotes in let was a bad idea, will not fix
Added code to strip quotes from rhs in comparisons

1 files changed, 11 insertions, 0 deletions

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 459abf8ffe1..dfd383cc714 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -5678,6 +5678,17 @@ void do_block(enum block_cmd cmd, struct st_command* command)
     while (my_isspace(charset_info, *curr_ptr))
       curr_ptr++;
 
+    /* Strip off trailing white space */
+    while (my_isspace(charset_info, expr_end[-1]))
+      expr_end--;
+    /* strip off ' or " around the string */
+    if (*curr_ptr == '\'' || *curr_ptr == '"')
+    {
+      if (expr_end[-1] != *curr_ptr)
+        die("Unterminated string value");
+      curr_ptr++;
+      expr_end--;
+    }
     VAR v2;
     var_init(&v2,0,0,0,0);
     eval_expr(&v2, curr_ptr, &expr_end);