From: Tor Didriksen
Date: February 17 2011 7:27am
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3336)
List-Archive: http://lists.mysql.com/commits/131496
Message-Id: <20110217072729.1578A37B1@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2205444897284299554=="

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

#At file:///export/home/didrik/repo/5.5/ based on revid:jonathan.perkin@stripped

 3336 Tor Didriksen	2011-02-17
      Disable this test when running 'mtr --mem'
      
      With --mem if fails with
      +UNEXPECTED ERROR NUMBER: 1290
      
      In var/log/mysqld.2.err we have:
      [ERROR] LOAD DATA INFILE in the slave SQL Thread can only read from --slave-load-tmpdir. Please, report a bug.
      [ERROR] Slave SQL: Error 'The MySQL server is running with the --slave-load-tmpdir option so it cannot execute this statement' on query. Default database: 'test'. Query: 'LOAD DATA INFILE '../../tmp/SQL_LOAD-2-1-1.data' INTO  TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`)', Error_code: 1290
      
      getcwd() in the server yields something like: /dev/shm/var_auto_iv5Q/mysqld.2/data

    modified:
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-02-17 07:27:24 +0000
@@ -13,6 +13,7 @@
 --source include/have_debug.inc
 --source include/master-slave.inc
 --source include/not_embedded.inc
+--source include/not_var_link.inc
 
 ##########################################################################
 #                            Loading data


--===============2205444897284299554==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   hxsivboz8xukysmt
# target_branch: file:///export/home/didrik/repo/5.5/
# testament_sha1: 31b0da2e9f1e093aa64f1bb00957d23da9de70c7
# timestamp: 2011-02-17 08:27:28 +0100
# source_branch: file:///export/home/didrik/repo/trunk/
# base_revision_id: jonathan.perkin@stripped\
#   pzlh88yhcioqrdrj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd8zBHYAAbdfgAAQUO//938n
/u7////wUAThvBHtttHQNBQNTEiNlJhpiaekg/U1PSDQGjENpGIABxkyaaYTIyBgRiaMEYQaNMAA
gyhPQT0hqYlPUfqeqMnqG1DINoaaRpoaANBAoamjTTI9TT1NNAABoAAAAACSQgBoRpkBNGU9Sb1P
VPRlMhhpPUNqaMI1dufOW278CxDfrgUu3JaDpDAGmI8ERzgqObNU33RWtMDI4a91Fh0xEQ9dinLb
CDEjlkktnKFYbl5CY/XzhYrkzsBhKdAzMxSv9DVsZu/YE4D5IlzcuN8roAhtuoE+Y2BEUsUoFgrM
cLU7HwPec2YGQVM1I59qUTmYAwkLfU/Kw5YQF5B7MePuF4I9oOFFHMNGaqeJCgsEc0zwG3YPHISp
cSLJJR5XhJTj9JXTXfxNm+tFOeTH2F9Yrmid/cDhEDkyCYY/ZJ55iXSTjZBMnN021qpk4kTc3d8y
D31f6dXtmQZx8HPqK6X3fni5Vm+mgiaLR+gxUHDhR17320Fm7U6imOjnposHAqkD7lpoFEGFdGUL
mB0ZyQygqScc+P04adZlVtuE1tzKGyD5Fr1uZPNhr+w4vLZC0YLFA7/TeHCu6jDm4U15q6uWTTkt
RGNWWVdSYl7RdEzFCoWynCJAoyNuoGIMQ29zoTgX+QNhARW1VOwuM3yuMLKy7SDYY2hA7RGtwbUE
DL6wmM5nQt/E3WwbiySEuR2zdlGDy5IMUrAuYkgmAZAEIiGcIQONxkmVkq9z8ucgjyXwXj6z5lRa
wx8/C8Ph8ZnIgM0Dax6XKjynaJ+8ONwb+xNrGFg/BtC1G7caKrE6mb8YfnYEgJMqYXUmKBL1MYhe
ADfaFkSEwJ8jXulRKKBEDpgpJwLd1NKADPGdWnAw9xvXLs9Twh3Dpv69j5yRMznc/h7PHIkZnkk4
c7emQbt2/PaH13du/AkKMSGI4DrPbqlLQXwdf2GZC+DcalVWnx79YWsuuOi3D3GqMMwruW2/gGzc
E7pj42zm6Oz717sVW5kh+XySL9u2Ud45PNhjvvLN0VjKvk+WVULtuxlw4Xk03qJ0uIeFhWBqWd1W
o3kMtsDVDTKOBdbfYkcJBcnxRM2NpyNY0FZG9aAOAli+LkP9eqFQxvujbMWnRTeupar/nG7Elz6s
NDkpID0wMXaZvPN1rsZxyK6pgbY1NYeeRPIS8TPacz++EOZVo7aDiVH1w659rFbNmetHo0O6InlX
m86bWD1V6U7wYs6OUsPIVKgYxLpMly6kn2TxgXUAXmQNKSrouxzgtj5mp79eMtOgMltvLKzDsB+v
X9245a7Es70xercGt3yqcObwOhEXUHGwLHhKcAh8mR+CSTnakOX06LK7hnOq/kSL9KYRzWZei8YR
vbUrbAmU3s4G8ya4wDT4Qd/PgJzlJWscPr8HIUaELSW+JhfBkM5wTZhz8SSFMs4pmTLpHNQXGKMd
DmckStbQjsW18o0E7toSd+EhwWLgOWYwsu7BVOHyQ5WbGZSh2qh0Q0WaJpcVYnKlrWnt01PfBKD0
zmZJW1b1vp65kOj2OKSTgBQyeqlHGXNcbu4hP4FDmrHHreOZsLGOuLsdUuBQBhUNpaN1IchPrUZ5
yC7hPH5nqwNSgPYOnMXabcMcQ8efhcxauvoVNIhKotFM+p9qw1YZeu942M6mUFWw6OGJu2azL34Q
Ng03tyDSsWrZX7sOPlyko2C441HAkyj0l1068NLxSAT0Z1WdpSG0rrCSHd6BOW0UMmD/Oogp8BYK
E5bclfozm9S/+LuSKcKEhvmYI7A=


--===============2205444897284299554==--