bzr push into mysql-5.1-mtr branch (bjorn.munch:2932 to 2933)

[Bjorn Munch]

 2933 Bjorn Munch	2010-09-21
      test fixes after 56753

    modified:
      mysql-test/suite/sys_vars/t/secure_file_priv.test
      mysql-test/t/mysqltest.test
 2932 Bjorn Munch	2010-09-20
      Bug #55426 mysqltest crashes when trying to unlock not acquired mutex
      Follow-up: don't call pthread_join() on Windows
      This change only valid for 5.1

    modified:
      client/mysqltest.cc
=== modified file 'mysql-test/suite/sys_vars/t/secure_file_priv.test'
--- a/mysql-test/suite/sys_vars/t/secure_file_priv.test	2010-04-16 14:10:47 +0000
+++ b/mysql-test/suite/sys_vars/t/secure_file_priv.test	2010-09-21 09:16:20 +0000
@@ -9,7 +9,7 @@ SHOW VARIABLES LIKE 'secure_file_priv';
 # Doing this in a portable manner is difficult but we should be able to
 # count on the depth of the directory hierarchy used. Three steps up from
 # the datadir is the 'mysql_test' directory.
---let $PROTECTED_FILE=`SELECT concat(@@datadir,'/../../../bug50373.txt')`;
+--let $PROTECTED_FILE=`SELECT concat(@@datadir,'/../../../bug50373.txt')`
 --eval SELECT * FROM t1 INTO OUTFILE '$PROTECTED_FILE';
 DELETE FROM t1;
 --eval LOAD DATA INFILE '$PROTECTED_FILE' INTO TABLE t1;

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-09-15 12:56:22 +0000
+++ b/mysql-test/t/mysqltest.test	2010-09-21 09:16:20 +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]