bzr push into mysql-5.5 branch (mattias.jonsson:3695 to 3696) Bug#13500478

[Mattias Jonsson]

 3696 Mattias Jonsson	2012-01-20
      Bug#13500478 63623: TEST CASE PARTITION_BINLOG_STMT
      CREATES A FILE IN AN IMPROPER LOCATION.
      
      Fixed by using $MYSQLTEST_VARDIR, as proposed by
      Davi Arnaut.
      
      Thank you Davi!

    modified:
      mysql-test/r/partition_binlog_stmt.result
      mysql-test/t/partition_binlog_stmt.test
 3695 Georgi Kodinov	2012-01-20
      Addendum to the fix for bug #11754014
      
      - Fixed the checks to properly check for plugin_dir containing a trailing slash or backslash.
      - Fixed a under-configuration in udf_skip_grants that was preventing the test 
        from running even when there was a udf plugin.

    modified:
      mysql-test/include/have_example_plugin.inc
      mysql-test/include/have_semisync_plugin.inc
      mysql-test/include/have_simple_parser.inc
      mysql-test/include/have_udf.inc
      mysql-test/t/udf_skip_grants-master.opt
=== modified file 'mysql-test/r/partition_binlog_stmt.result'
--- a/mysql-test/r/partition_binlog_stmt.result	revid:georgi.kodinov@stripped
+++ b/mysql-test/r/partition_binlog_stmt.result	revid:mattias.jonsson@stripped
@@ -8,6 +8,6 @@ name TINYBLOB NOT NULL,
 modified TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 INDEX namelocs (name(255))) ENGINE = MyISAM
 PARTITION BY HASH(id) PARTITIONS 2;
-LOAD DATA LOCAL INFILE 'init_file.txt'
+LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/init_file.txt'
 INTO TABLE t1 (name);
 DROP TABLE t1;

=== modified file 'mysql-test/t/partition_binlog_stmt.test'
--- a/mysql-test/t/partition_binlog_stmt.test	revid:georgi.kodinov@stripped
+++ b/mysql-test/t/partition_binlog_stmt.test	revid:mattias.jonsson@stripped
@@ -8,7 +8,7 @@ DROP TABLE IF EXISTS t1;
 --echo #
 --echo # Bug#51851: Server with SBR locks mutex twice on LOAD DATA into
 --echo #            partitioned MyISAM table
---write_file init_file.txt
+--write_file $MYSQLTEST_VARDIR/tmp/init_file.txt
 abcd
 EOF
 
@@ -19,8 +19,9 @@ CREATE TABLE t1
  INDEX namelocs (name(255))) ENGINE = MyISAM
 PARTITION BY HASH(id) PARTITIONS 2;
 
-LOAD DATA LOCAL INFILE 'init_file.txt'
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/tmp/init_file.txt'
 INTO TABLE t1 (name);
 
---remove_file init_file.txt
+--remove_file $MYSQLTEST_VARDIR/tmp/init_file.txt
 DROP TABLE t1;

No bundle (reason: useless for push emails).