From: Bjorn Munch
Date: September 21 2010 10:17am
Subject: bzr push into mysql-5.1-mtr branch (bjorn.munch:2932 to 2933)
List-Archive: http://lists.mysql.com/commits/118692
Message-Id: <201009211017.o8LAHZ6U028184@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1305535566=="

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

 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`


--===============1305535566==
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/btfix-51/
# testament_sha1: 50b5ed2d07dffb6d9301b13ba94006cb50396889
# timestamp: 2010-09-21 12:17:35 +0200
# base_revision_id: bjorn.munch@stripped\
#   yvo3rjg9o8swiyml
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZCcRYAAAkhfgAAQXef//38m
/SD////wUAUtd5z1Gm6727nq2daHQaknkxRppoYTQbUAAGmgyA0AAJSCJmptMIaRqanqeTUeo0AA
BoAaNBJI0jQm1TyT1R5T1NDQaNGjPUhtRkNDamICSSSe1TZGRqep6jEeUGQ9TTT1AAaB6mgBJJBo
EyaaZNJP0TCbSJ6jBAaGjQGg05XhrTBL+WDqA9fBSc0xlIqs8VcNAEUwZgpkqOwZAVIPOMfQ/ilr
ImAzMzL9bjrCuVbF7uQvOK+o0zjGyUERRiWC015yhZxSXCgN9vx7NNl8IODFIAuaCC2+YVKr7IW9
p0QMgpzJGUu8rQSVzPA+yFYzUhW/2wZ7AfvM4jNO64DBjojOaZdy7lGUbkJkLPSL+jMxr0SGkfVK
Q+YtZ5C3SJGjVaBWOhYgIUzAmSBnMZ2Osc5CtD9tKpaSZZOxrAGEnCuKY1Htk+ymQFxswFSv5kU9
DjuSW2nTiqgMzh57oRnGjNUo28jZaq9JQ2AqCdD85zRYG7Sa+O0uLywtG62UtYTFqaVJlEDWt5Ww
STl0R0iUzf1ErRwtgMsT0xhgPiyHvMhZrA5k64v2QYbC12mltYqV7IWF2su1dIszeUpgSOR2dKXm
lu/ESQpSUpNpsImc3RlgXZOiLIOqqcgrFK0zh2+YYltN02OKOH8AnWncmtwsjqkm/IvRjx0pHRaV
JD2pLrTLdg9TFJJJzNRAE/Cepoy8B5fDJCWcThJHZkXjthlGqtZBgTYXQyPDA3gPqLLbGi4wrKKz
HmJ6LNcamGV6bc6r9FIiEsyZVTOoaPLiGXAsrnYtgjHQ9JRaT2RUIA1TOq0VNXC0zwD4LEY4yY4y
hzMy9cnMSmjy89CFF9CjlGTM2C9Ww6wTv3U207ZkAOk7+vsFut7gOwCk3OPeleBMW4Xdw94EoEZ/
J2ylgoROF5gVwlgrUr23MzAeHogR53n1vMwXzgkgTHqz6BDoXG5MUQllICT9oS664GzoIHgzwZiT
aXlu0XpXZu2puhigHuwP9l8jYazGB+CmFnOHQbUw78YdkOxJh8hSU1EBhLsJDPh19TklVG9zIVol
LmiIWFmqnsLgIyuf7GikIsJglId5IhvB/Om3H1AjbYG+muBAWN47HeNT6CrHicCyitw5x+DKshUh
l1QTo3NMEptu01cqbrVNaNx22NUzsWXEiKkmigwx6s2Vv8iDPc4u1aYEk1yjppRKSPQ+K0wzqtK1
xYUrvDqOI8Yj17VHL8cVr59qNEnjbxJKETQR3C59WBFC0webY+/MhoaVQhOL06I4raMNyZEU6JVj
ZXzUoTduKzBCt0GnboRjXUUMdQShAjJwIAhOjaLIhMWDIiHYXNpdtlET3mqPjaJXrWQmeop/SflJ
hPetvJC5hZ5LRS7fghQzAYImBS93gyFWj1VSiWVPxW2CjYGUxvzGbmcjUtAHYqQJ4n8X6klQHOzt
0gV9iFdRKqxLPApxijfqQSLWiqYYLixPpi3MyfgL+UDIAbpjW1F0AQCDF1C4EaVDq1FTt6StcFQg
L8z4rCwmB/WMqoFqMCa/0X6wHl2OJ9DSG/OYIY7aVi2SWZtguAim9gCfIjobuUK0YlGkY7YXGTNj
Ag2mEg+IkCOBrCCo2QFhlYOQjoBseU+S6QdeKSkSCOMV2KCJHKHM0lhd3z4ckEZekbk7pgRTKOCk
PKes2KTaZ9BxyqIoKeXkd9Kh53IlJJqxjB6qAuERqMDYdJKBBbImnzH/F3JFOFCQkJxFgA==


--===============1305535566==--