From: Tor Didriksen
Date: November 9 2010 12:02pm
Subject: bzr push into mysql-next-mr branch (tor.didriksen:3374 to 3375) Bug#55790
List-Archive: http://lists.mysql.com/commits/123231
X-Bug: 55790
Message-Id: <20101109120236.0CDF9372E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3375 Tor Didriksen	2010-11-09
      Bug #55790    Read_Master_Log_Pos is wrong after Slave_IO_Error= ER_NET_PACKET_TOO_LARGE
      Post fix: LOAD_FILE silently fails when running in parallel because of is_secure_file_path()
     @ mysql-test/suite/rpl/r/rpl_packet.result
        Use MYSQLTEST_VARDIR rather than MYSQLD_TMPDIR.
     @ mysql-test/suite/rpl/t/rpl_packet.test
        Use MYSQLTEST_VARDIR rather than MYSQLD_TMPDIR.

    modified:
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/t/rpl_packet.test
 3374 Marc Alff	2010-11-09
      Fixed broken merge

    modified:
      storage/perfschema/table_threads.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result	2010-11-08 02:49:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result	2010-11-09 12:02:20 +0000
@@ -77,9 +77,9 @@ INSERT INTO t1 VALUES (REPEAT('a', 2048)
 Last_IO_Error = Got a packet bigger than 'max_allowed_packet' bytes
 # Record Read_Master_Log_Pos for the Table_map_log_event
 SET @@global.max_allowed_packet=1048576;
-SET @b55790_output.1= LOAD_FILE('MYSQLD_TMPDIR/b55790-mysqlbinlog.1');
+SET @b55790_output.1= LOAD_FILE('MYSQLTEST_VARDIR/tmp/b55790-mysqlbinlog.1');
 WARNING: The range of printed events ends with a row event or a table map event that does not have the STMT_END_F flag set. This might be because the last statement was not fully written to the log, or because you are using a --stop-position or --stop-datetime that refers to an event in the middle of a statement. The event(s) from the partial statement have not been written to output.
-SET @b55790_output.1= LOAD_FILE('MYSQLD_TMPDIR/b55790-mysqlbinlog.1');
+SET @b55790_output.1= LOAD_FILE('MYSQLTEST_VARDIR/tmp/b55790-mysqlbinlog.1');
 WARNING: The range of printed events ends with a row event or a table map event that does not have the STMT_END_F flag set. This might be because the last statement was not fully written to the log, or because you are using a --stop-position or --stop-datetime that refers to an event in the middle of a statement. The event(s) from the partial statement have not been written to output.
 ==== clean up ====
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-09 04:28:48 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-09 12:02:20 +0000
@@ -195,7 +195,7 @@ INSERT INTO t1 VALUES (REPEAT('a', 2048)
 --let $MYSQLD_TMPDIR= `SELECT @@tmpdir`
 --let $start_pos= query_get_value("SHOW SLAVE STATUS", Relay_Log_Pos, 1)
 --let $relay_log_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
---let $outfile= $MYSQLD_TMPDIR/b55790-mysqlbinlog
+--let $outfile= $MYSQLTEST_VARDIR/tmp/b55790-mysqlbinlog
 --let $i= 2
 
 --let $old_slave_max_allowed_packet= `SELECT @@global.max_allowed_packet`
@@ -219,7 +219,7 @@ while($i)
   --exec $MYSQL_BINLOG $flags $MYSQLD_DATADIR/$relay_log_file 1> $outfile.1 2> $outfile.2
 
   # Load outputs into a variable
-  --replace_result $MYSQLD_TMPDIR MYSQLD_TMPDIR
+  --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
   --eval SET @b55790_output.1= LOAD_FILE('$outfile.1')
 
   # Check Relay log contains the Table_map_log_event

No bundle (reason: useless for push emails).