bzr push into mysql-next-mr-mtr branch (bjorn.munch:2979 to 2980)

[Bjorn Munch]

 2980 Bjorn Munch	2010-09-21 [merge]
      mysqltest.test fix after 56753

    modified:
      mysql-test/t/mysqltest.test
 2979 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 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-09-20 09:11:31 +0000
+++ b/mysql-test/t/mysqltest.test	2010-09-21 09:23:17 +0000
@@ -497,10 +497,19 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqlt
 #
 # Extra text after ``
 #
+# Cannot use exec echo here as ` may or may not need to be escaped
+--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+let $x= `select 1` BOO ;
+EOF
 --error 1
--- exec echo "let \$x= \`select 1\` BOO ;" | $MYSQL_TEST 2>&1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
+remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
+--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+--let $x= `select 1`;
+EOF
 --error 1
--- exec echo "--let \$x= \`select 1\`;" | $MYSQL_TEST 2>&1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
+remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
 --write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql
 # Missing ; in next line should be detected and cause failure
 let $x= `select 1`


Attachment: [text/bzr-bundle] bzr/[e-mail]