Merge mysql-trunk-bugfixing -> mysql-trunk-innodb

mysql-test/include/not_var_link.inc

+# Test if MYSQLTEST_VARDIR is a soft link
+# If we run in parallel, we have a suffix "/$child_num", so chop off that.
+
 perl;
+  my $path= $ENV{'MYSQLTEST_VARDIR'};
+  $path=~ s|/\d+$||;
   open (ISLINK, ">" . $ENV{'MYSQL_TMP_DIR'} . "/mtr_var_link");
-  my $mvr= -l $ENV{'MYSQLTEST_VARDIR'} ? 1 : 0;
+  my $mvr= -l $path ? 1 : 0;
   print ISLINK "let \$mtr_var_link= $mvr;\n";
   close ISLINK;
 EOF

mysql-test/suite/binlog/t/disabled.def

@@ -9,6 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-binlog_truncate_innodb	: BUG#42643 2009-02-06 mats Changes to InnoDB requires to complete fix for BUG#36763
-binlog_unsafe           : BUG#50312 2010-01-13 lsoares Warnings for unsafe sub-statement not returned to client
-
+binlog_truncate_innodb	    : BUG#42643 2009-02-06 mats Changes to InnoDB requires to complete fix for BUG#36763
+binlog_unsafe               : BUG#50312 2010-01-13 lsoares Warnings for unsafe sub-statement not returned to client
+binlog_spurious_ddl_errors  : BUG#54195 2010-06-03 alik binlog_spurious_ddl_errors.test fails, thus disabled

plugin/semisync/semisync_master.cc

@@ -1128,12 +1128,13 @@ int ReplSemiSyncMaster::readSlaveReply(NET *net, uint32 server_id,
 
   log_file_pos = uint8korr(packet + REPLY_BINLOG_POS_OFFSET);
   log_file_len = packet_len - REPLY_BINLOG_NAME_OFFSET;
-  if (log_file_len > FN_REFLEN)
+  if (log_file_len >= FN_REFLEN)
   {
     sql_print_error("Read semi-sync reply binlog file length too large");
     goto l_end;
   }
   strncpy(log_file_name, (const char*)packet + REPLY_BINLOG_NAME_OFFSET, log_file_len);
+  log_file_name[log_file_len] = 0;
 
   if (trc_level & kTraceDetail)
     sql_print_information("%s: Got reply (%s, %lu)",