From: Bjorn Munch
Date: September 20 2010 8:24am
Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:2969)
List-Archive: http://lists.mysql.com/commits/118568
Message-Id: <201009200825.o8K8P9vH026037@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0655625666=="

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

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

 2969 Bjorn Munch	2010-09-20 [merge]
      upmerge 56753,56787

    modified:
      client/mysqltest.cc
      mysql-test/lib/mtr_report.pm
      mysql-test/r/mysqltest.result
      mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
      mysql-test/suite/sys_vars/t/div_precision_increment_func.test
      mysql-test/t/mysqltest.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-14 12:23:53 +0000
+++ b/client/mysqltest.cc	2010-09-20 08:24:39 +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/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2010-06-10 08:34:16 +0000
+++ b/mysql-test/lib/mtr_report.pm	2010-09-20 08:12:39 +0000
@@ -229,7 +229,8 @@ sub mtr_report_stats ($$;$) {
   # Find out how we where doing
   # ----------------------------------------------------------------------
 
-  my $tot_skiped= 0;
+  my $tot_skipped= 0;
+  my $tot_skipdetect= 0;
   my $tot_passed= 0;
   my $tot_failed= 0;
   my $tot_tests=  0;
@@ -246,8 +247,9 @@ sub mtr_report_stats ($$;$) {
     }
     elsif ( $tinfo->{'result'} eq 'MTR_RES_SKIPPED' )
     {
-      # Test was skipped
-      $tot_skiped++;
+      # Test was skipped (disabled not counted)
+      $tot_skipped++ unless $tinfo->{'disable'};
+      $tot_skipdetect++ if $tinfo->{'skip_detected_by_test'};
     }
     elsif ( $tinfo->{'result'} eq 'MTR_RES_PASSED' )
     {
@@ -376,6 +378,9 @@ sub mtr_report_stats ($$;$) {
     print "All $tot_tests tests were successful.\n\n";
   }
 
+  print "$tot_skipped tests were skipped, ".
+    "$tot_skipdetect by the test itself.\n\n" if $tot_skipped;
+
   if ( $tot_failed != 0 || $found_problems)
   {
     mtr_error("there were failing test cases") unless $dont_error;

=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result	2010-09-01 14:02:56 +0000
+++ b/mysql-test/r/mysqltest.result	2010-09-20 08:24:39 +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/suite/sys_vars/t/div_precision_increment_func.test'
--- a/mysql-test/suite/sys_vars/t/div_precision_increment_func.test	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/div_precision_increment_func.test	2010-09-20 08:21:55 +0000
@@ -19,7 +19,7 @@
 #                                                                              #
 ################################################################################
 
-let $save_div_precision_increment = `SELECT @@global.div_precision_increment`
+let $save_div_precision_increment = `SELECT @@global.div_precision_increment`;
  
 #SET @save_div_precision_increment = @@global.div_precision_increment;
 

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-09-01 14:02:56 +0000
+++ b/mysql-test/t/mysqltest.test	2010-09-20 08:24:39 +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.


--===============0655625666==
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-tr/
# testament_sha1: 26ee8b8b79b81a5d9d0c7a86bb484e363d0db7b0
# timestamp: 2010-09-20 10:25:09 +0200
# source_branch: file:///home/bm136801/my/mysql-trunk/
# base_revision_id: bjorn.munch@stripped\
#   velebgd1n7lkbmmf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT9XYqQAD81fgFAQff///38m
vaT////+YBYHO2N12+3ez4w72vrR3dy9nvZre6uPew9Yabu3Le53np9217sntut7JdzOzfWOm2AA
NAPkAdFQkkITRkVP1Hp6jyJ5MkyYIIjNAQw0HqNJ6eqCURpGCZT0piNqiPKN6oeFAAG0TQAAAJQj
JqnoKaD1Jk0GmgZAAAAAAACREEEmE8oT0FP1RtRoBtTTQBoAAaACKRAEBoCMI000mmFPSNqGoyGj
QANAJJCYQyJiBFPwhqp6TZT1A0xGQ0AADI8XGsqzc/MzM6p5aJfPuyy4WT3RMwOYzXs9ff9yZ68f
qzDYT4PGIiI+h4HlfqnGwvydMDp/clHQTjpYDZKM/3kRHnhJH5a34Yxuzp3cJ0ytVzSYpO/fx7RB
mzJ7GNgZPJmLVLQTSE2Klc87mGxxS4JZ57czNXgL4MjY1amkUrguVVjKavkJF1Fu00gZRabeNhNW
+PMXmGsEEaF3h4V72+o8m7W4n2gctXFmlgYOsP6DsvTPT++qy0PBJbkjuSuMYyBA22xpjGxtsG0D
Yxsfi2HpMhjaEd3KOFwwFiQ2NobG47pI7H3OcCk40I5cogm9YtXBrlaYnF4uYJrjYgncMkcthF1u
qVZgxpTHC0EKMoqo99j8D2qhacpSWi30V9mW0nZMGXesGjBnunG+qwI5UWi3xYrg1lqzwtcFrNaF
nYdlrFcNUqtCV4fbs/gTcYPWsuyZqRd0SfIUmBgosYHcYkdm66O840xus2d8IWXHuN4nFCAA9rFB
Gr4+216+/leNDwsjg/6MOfeO0RE+S4pCtyShGL0IupGXOBHhm+8/3ILxJSjdptyrONpRkaNB0ari
GuKBrgfxgMi2r0KPcrRQxgNU/yOe5z8/Xd6vsCT4b6lzoKyqo1bcFmzODTAW5XiPLvZKdVBEtt21
3cPquJLBpCPiD6ZEu6IiID0j84MPoWfXKtY9Y+oejTFa9/pJ/bDGybpL8hM7NuR5QvMF9v2aiwVo
pQW0qHdYvcPAQtqCC6MVnUG8KToDF1G7a2tI3FmxtIkBiZjxeoZjQPRQ1oeRZaCYlPvHNT6DhIbW
0GESkt/Spwx6jh6lt99JGajNYhuwTQMmFVI3Mpig0A+zDih4QP38gCx04IiG4CIiIiIgP9U+Xt5b
6TSIiIj41ynlHQbAEYPpaENpuGBxYDYdSwF1WK+IVshYCvQTCBKsSxWCpVCUjSQNJjTaBIg1Oy9R
W0zMGjATDmsigmIBZCgpzEzkpAopexRObIE0SEmFoCQUBHsKE40mxM6AY9hylfII4kxL7qhlIlRM
4oDpOdR9Emw5hAp5rEhgykmdCZKjWeNiwDuAgukDpXCNLnDWYKSHA9kFWAEPL48ZVLhgiSvSCTQT
UcySJA69R5YWIScYzEYRWLjA+IKyDjvM/AqOvO9DcL4szIRrHW520LlFkg2YsyGQ4ZlliHOPIGIf
qigAwuQJJDYtT9Vh5grk8Ewmwm9bDBn/P1BcdA/YKBtLIVtCori4gmt2wFiLkGFIhsTHBo2wxZBD
XnJCM4aE3bxMbsLjfXXR9muri/zlSl8HxFY6BpN7Yq1C4imTFmccYcuGBYtxqmNypmiCXaUCBKC0
BXSs4N4nASlF+hAlMRBpliRV9OrmZoG1RcicdnXMrorC4pdILebaF+nhLJVRkJ22QLydRt9Egzux
dna82iETFgMYhYjuYTJhVST1O48raDolChHkJW0DM5hmKZC84QvaRQSGm2BB56hgu/UWgSgdF4zf
v1HfSSVw2VmWbymsRFb73F7ffFKhW1oleKmwsFL1iFCBhAIZCZJAqk5gpBUHNJ5hFxqVnig3ufRC
iHk4ohFwLC4gRJlQ0+sUTcxcrEQnMHOKaCayBrlsS0Q4JUEsmsRocqWN1xkEMatYscK6uNDB5Flm
2p6wkZ5qK52wcCictawMqF3CaClDvmOy3Bvxp0wvBJ4TsLiFjgQvOOmc4hWORDooeepEdpmOKPhH
zQRBlXAzQR3/MbB1QhlZVFjjg+iNngVgo6xTCKUFpSWWYnRVNBiU37RcZCHKo8VWRQKOxkPEwuLH
yilKV6QP15VyjiXyTlcKVc/c5zUphhYE0TWTwncyeZT3HXUgDUXYUmQtIhwbgtbcV2zr2GAVCuKD
EFfUnda5BZ9e7Q8iIGuRQcljaJ1PJlQg05YnInMMEzI3JvO/Zz63xrhRlorRUO2VFccDnK9EhnNE
hYvASeTQGK6bUzAnEJzqS731VBgSkZaBkZLUtEmTkcRNIOJUzMTjgh0T22CnaNK5jFvNa1IxzIaE
DUWIwmTdeFZEQ3yzLbA4VwOmTMGzYafRgq9nlSWRIVEkhkuCEYZYkd4VuOBJbh0mgUaJFO3K0nST
yRLV1DQy5HBvQkeY9BuujHVtloVIPwYe9X13oGZHqbJUmHPjXJBjp2dOAPsUQQ8ybuoROTy2EVMI
D2JcgZYP05NurkK6/Sr5BR8zqEMElwv66DyNyZjDBOeybNM5M9BD1rjXULdAuFtOKSN/2QTfXtWx
iG1LGMTsPwC59IWCDiQXmmbz78A+SIdFcWrjQ41GhtgdHInM0OovcLSyv5EQvWJWgxaJBzcOgpwV
N1Zz54IcM0tjCwlm/gdWwfTDsgvKyMHJYVDiULFkIYdF0B9rUPHNxSKm7YInmMpPvpoS3WHhMNFH
k+s3XmDGHCdKzj12tw0xsmeQWBuGHlZLnwiDXgsTNW8vE6Mww4dETh2CYEQ5ocdyhPD+6w4oWDdq
FjkXIEDWlaG9LVSTs85Cdx5TQTurvEwJ3JFA5BgMI6G2zHwOHHQtuxdhjhwK2CVWKuuBuSGwNyUd
dzY8zdrZivtV6jwsOOInIGDLQKMZ4uUBSF0aoXNwlGKEBSe52RjOsRlgMdiKXmbbcd9YEjAp5jXx
MXsS8gotBapC5vDHY04ELWkYR4cCbygnVhRSWWk18XtOgbxw7xTePMdue/ThhLbOIp0TxiLks1JS
gWowIQTSAR1DQFarU6Q4348qywywQOGU2BWneS9oymxMSGHscy+2GZcpwQpFltzRAfYu6pJyGUDW
UBoZNe9E1iFirxJeQSuUApyoPoYNTPeKX00IOJBIc6j4T6DtO5EDzPgRSDqEracdAc1hkzJ7cWI1
hCEKNcz45PyFKEdOGM1NOrmB1KGuGbmws5KKhzNF60CUkS5kShnLogiS+cD6Da8ayKzYaxb2HgiC
KMNyTLKAZGBeOrZIyydYwPvnlEjm9CoahOttMJLBVJ2YRyjnLWQoZR9mZWY6QcgSiD0NAvU20MTM
O+oUIJpkw3MNIrSY43GEozPdqGgclizkXjaLkHVEkpoVSFk4DCUDiGKRuamUhmI0jJRgaBnZOlEn
MFqrGBjHj0e/oy+8fjy8RVpfChH4BpndeYt5ZqLiBqwYNNK/YkEBEREQESZgyYYEfiP3K5HvHoYg
/k+YfaiDLxPKJ/kfo/2Nha5klEMQMJCkIDMDuG0Bg4lK4HgSMHiEswr/2mR4kwMKHgAyV0PnfQCf
/UVXsH3gTFJdJr/wSNVuX3XKUFpACZyIO7+n0jWXOD3/j2dckIOqPCLxhkLCkBJHAk70oOtSIgQT
INq0aI4RIEO0n9y3iWvk5OEYUXToEgiu+h9w/CQNtGRRghWg+h93I+J+BP2s8dhgofSHq5JUNPQY
qHnMCfKgeMSgRdX0FvP6jh0PLjKdFpHMzLi/QdcbynsXrmhApL7UEw8k3NxINV+5axsBeY489wPb
NDuyZ+u/CsbgCMw4hpq23Dv7tQA/k3caNFNq9iQux109/CEPfUcc5SSHMdQoOP3KX2axCPl3zMbz
EHDj17nQp1xIe3g8GXgMDKY13Y65eweMzRiBykbwwHyYiEw7Cx/Xu+5bklJImiAGRAQQhhADIHAM
gcLBJICX/BjwcTsPzctI0jMxZj3l7qgQa3yfCw2+cUHri0GOHQOfEw7E5FB3Q73XhIw3ke7Ei9um
qIG3V2BvrPBr4IlihqMVej56kOpxgvfAxqb07cXltB2RmZ0McdxEJnTTM9DiIEvbY3ILPAgBHm0h
pFRyDWzTk0tgFbHwO/zGtKDWOcDMqGCkS5zJQZ84osdchMsSCklrLAyoGvDkKw4uCYSDuddRI7Du
mqQnFrhO2OuDyt5uImQIGeWX2lDd6FTMn9W/evExjCmz2f8F6fglMHNkOQLRbT830I+GXBOd3CUh
t2dpZOvIt4nrDjM4tS2bCII+zzb98Z1cqkLsESSfHB88cMN7LHisTkIFfZJdcA/Ca1PgEr4b8vXG
Uj2eYg89xQPxK9VLolTZcztGGNN+53F11eLw0c5sQ1hi6V8DvW8iRxNwN7y7zWXV+XwDPQRpG/HQ
FZxV4K0DdEEAcCIiIYIkHGcW8VdILBsQp0Gow694N4cbXL4uHYdlZ7z46IxvWaK+ruelo+IkZOMh
h/fYyPLLr3Z13mHImbxT5v9NvaIo4hx2kK9eBd3954176i7V6tk6At11mg78iiBY0EqqRTsgLMWc
EWmTpUYnMkmpwCB6r2AYc5Dfk3NrLwY2vFzuA4VBjDMOa4ZpjfpCCzGJoUAWlDmSeNCZIc9SAVYL
YnRgQSFmfUqVWg9dTtVwkR8jP2YOBcpePmg46izxVK7PS5NtJajxcMDioz9Ew45vsK5JnJU3uwgX
6xT5R7qlC+hsYg6pXaKEUDVZml5HRU5oRxQaD5q+SutWZBVtGHsdRxac4wuMZ7TOdi9iJVeb1570
Lhy30VcyackLmbkN/gYBUePaNY73vJQ6KwwGGAXrPsh32lTe50TYoLcIiAnaROUCSiLjDfgtctvb
hKZVWLEV31QKmIUwtKHRDmgGYfhF/mcB3D0OB5c807dIxvHvBCB57i1pHYfpSiSnnB6OpAdFOeoG
TX8nGzhJglgG+Rd1vpwdLDU16+894vUVhUVmARIOeaRhW41pxGrUAXI9+ewMF53KQFAlQ09VYmoB
Tq7J0KHFmbX7jaoUobgmfEzHU5T6DaKD1PNzaZDmHOc9p0mSiL9TJNLoPUKjEhBW/A0Inq9T3gtS
mCJkel7LJ0GcjRWy8wdzyXiYabiYTtAbRsYUah8h5rqagGzc3HGhDuNhiQKjMiDIAKRninu4PR9+
GPcNxuxNgX6tppZYhyWzzjL5XoZk4X3obeoH77kNoKVD1Dg83NKwHk9zrZZdGDi9mZvk9Xa0bCkB
G4ZvgTH7UNe+oW0rQLGRoXQPW9hIfF0udC+Y0uQZ3aXEN6JT0X2euQ2UpyO6t8BQelRiPrCsaxgf
oyZD0YUrt9SDVtGJXS/VSlESkvelQoNExgOVXkHu9gelat0KXDgAWMkNowKDJDGk4kCxAYm6ArGK
6FMo2EjW/nHSrOieLViEpIQLIUJykoyJQIdp80MvwHI0fU9vhEz1MM5Q0vK7PaPydBSLI80T2KvV
EXG4ApAzX0LZOZe9EHKC/HlQLjBR9EXCCHByF0+C1MzMM9a3ZPsfElz8ya6+oOF5AgwRMfp1B0vu
Qr6vMYVhRihuRPbUHUtewcxPIPoay2VhjOYV4llPU/UnxTNIzjS4kP3BfnznMbzi4Ha1bmC/B3nF
oUHt7EPg94exORnKx4fiGU4LpDcsatI9TQBQO+hgiSAByHQuMs1U2dvmNGxLsSHRPquAHtob5tad
yHIaxrROjkUri2zEGSJFDwGHAcYiuCJmi2se5l7Rg+w3OTsbwuKFluPgPE7vWkQqDnwpzaadGTUE
rLAg7B81Ctp7Wo6Nw+v7OtsHa47HwB9Z+DjO9eZchcTYqG0abQ2A2N8kl3mT4Q0bRIPBVSXeg9EK
4xs95bkl4MbBsbGx9uzX21zi6IiIYYYYYbsvXxajiEQCngO5dMJGOSqdowCXZAWWEIbknzsfGkbe
LOZ7JPvwD5tGE9bCfOK4WY67nMwMUIVsImsaCZMeT4hjXIUN+UbACa5BWpZBOhoBqZFA3u4HPUMF
SW2RX8VrHW9aXSkOAKSBCB2/UPob8ESoy5xwsNI+24HxNVfFsdfY4ru12AtIhoG9druQ6/Cort0E
1HAahmOdDd8aCohyUIZHq+TAe5lescVTl1FoyF8hl5H2jaKDm2WEeJ3IcC/g8cm7KGK8KtmavabV
yDzULKVNh5ocBXZi+KSlLrqS5n44pr6xiCEtyCcjVMyiQBYL0uB0gwiWhyOomdbsUKByma5DEPki
XBFFmj2J2kzf9gWvyCkyY0IoHE7NowOtpfF+tE6/FO3rbMqHuE0EmDA/v2DqMbyXaDl5mnUKO4aN
PBVXBZZyIL0YSiuFqFrFLZhMYwAs2A8x6DxUMw+RoH4dEIb9Ozjk7uCuKMZU2Pc1iyQoE80HOlUq
hUKUXMafeMv5P/F3JFOFCQP1dipA


--===============0655625666==--