bzr commit into mysql-5.5 branch (tor.didriksen:3336)

[Tor Didriksen]

#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


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