From 38604de3a0fec8a3ff73b2e3c945617a1388759e Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Wed, 15 Sep 2010 14:56:22 +0200
Subject: Bug #56753 mtr silently ignores junk after backticks When stepping
 backward to end of `` expression, check for illegal chars

---
 client/mysqltest.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'client/mysqltest.cc')

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 31854737cbc..a84ad2ad9e8 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -2181,8 +2181,14 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
   DBUG_ENTER("var_query_set");
   LINT_INIT(res);
 
+  /* Only white space or ) allowed past ending ` */
   while (end > query && *end != '`')
+  {
+    if (*end && (*end != ' ' && *end != '\t' && *end != '\n' && *end != ')'))
+      die("Spurious text after `query` expression");
     --end;
+  }
+
   if (query == end)
     die("Syntax error in query, missing '`'");
   ++query;
-- 
cgit v1.2.1