From: Bjorn Munch
Date: September 20 2010 8:08am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3089)
List-Archive: http://lists.mysql.com/commits/118562
Message-Id: <201009200809.o8K8938j016835@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0302898699=="

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

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

 3089 Bjorn Munch	2010-09-20 [merge]
      upmerge 56753

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
      mysql-test/t/mysqltest.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-14 12:19:51 +0000
+++ b/client/mysqltest.cc	2010-09-20 08:08:32 +0000
@@ -2185,8 +2185,14 @@ void var_query_set(VAR *var, const char
   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;

=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result	2010-08-30 13:19:46 +0000
+++ b/mysql-test/r/mysqltest.result	2010-09-20 08:08:32 +0000
@@ -177,6 +177,9 @@ mysqltest: At line 1: End of line junk d
 "
 mysqltest: At line 1: Extra delimiter ";" found
 mysqltest: At line 1: Extra delimiter ";" found
+mysqltest: At line 1: Spurious text after `query` expression
+mysqltest: At line 1: Spurious text after `query` expression
+mysqltest: At line 2: Spurious text after `query` expression
 mysqltest: At line 1: Missing argument(s) to 'error'
 mysqltest: At line 1: Missing argument(s) to 'error'
 mysqltest: At line 1: The sqlstate definition must start with an uppercase S

=== modified file 'mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test'
--- a/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test	2010-01-14 10:49:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test	2010-09-15 12:56:22 +0000
@@ -205,7 +205,7 @@ DROP TABLE `t1`;
 
 -- echo === Using mysqlbinlog to detect failure. Before the patch mysqlbinlog would find a corrupted event, thence would fail.
 
--- let $MYSQLD_DATADIR= `SELECT @@datadir`;
+-- let $MYSQLD_DATADIR= `SELECT @@datadir`
 -- exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug42749.binlog
 -- remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug42749.binlog
 
@@ -330,7 +330,7 @@ while($ntables)
 -- echo ### assertion: check that binlog is not corrupt. Using mysqlbinlog to 
 -- echo ###            detect failure. Before the patch mysqlbinlog would find 
 -- echo ###            a corrupted event, thence would fail.
--- let $MYSQLD_DATADIR= `SELECT @@datadir`;
+-- let $MYSQLD_DATADIR= `SELECT @@datadir`
 -- exec $MYSQL_BINLOG -v --hex $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug50018.binlog
 
 ## clean up

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-08-30 13:19:46 +0000
+++ b/mysql-test/t/mysqltest.test	2010-09-20 08:08:32 +0000
@@ -494,6 +494,23 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqlt
 --error 1
 --exec echo "--disable_query_log;" | $MYSQL_TEST 2>&1
 
+#
+# Extra text after ``
+#
+--error 1
+-- exec echo "let \$x= \`select 1\` BOO ;" | $MYSQL_TEST 2>&1
+--error 1
+-- exec echo "--let \$x= \`select 1\`;" | $MYSQL_TEST 2>&1
+--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+# Missing ; in next line should be detected and cause failure
+let $x= `select 1`
+let $x= 2;
+echo $x;
+EOF
+--error 1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
+remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
+
 
 # Allow trailing # comment
 --sleep 1 # Wait for insert delayed to be executed.


--===============0302898699==
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/mtr-55/
# testament_sha1: f2efff459871fbff25091dfb9d4aa537b13e7c7a
# timestamp: 2010-09-20 10:09:03 +0200
# source_branch: file:///home/bm136801/my/mysql-5.5/
# base_revision_id: bjorn.munch@stripped\
#   frc7l7034mqxuvam
# 
# Begin bundle
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


--===============0302898699==--