From: Date: February 26 2007 11:00am
Subject: bk commit into 5.1 tree (msvensson:1.2469)
List-Archive: http://lists.mysql.com/commits/20556
Message-Id: <200702261000.l1QA0Qsb019903@pilot.blaudden>

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-26 11:00:17+01:00, msvensson@stripped +2 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2372.122

  mysql-test/r/rpl_temporary.result@stripped, 2007-02-26 11:00:08+01:00, msvensson@stripped +0 -10
    Use local
    MERGE: 1.18.1.9

  mysql-test/t/trigger-grant.test@stripped, 2007-02-26 11:00:02+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.8

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.14/mysql-test/t/trigger-grant.test	2007-02-24 08:19:58 +01:00
+++ 1.15/mysql-test/t/trigger-grant.test	2007-02-26 11:00:02 +01:00
@@ -368,6 +368,8 @@ open(FILE, "<", $fname) or die;
 my @content= grep($_ !~ /^definers=/, <FILE>);
 close FILE;
 open(FILE, ">", $fname) or die;
+# Use binary file mode to avoid CR/LF's being added on windows
+binmode FILE;
 print FILE @content;
 print FILE "definers='' '\@' '\@abc\@def\@\@' '\@hostname' '\@abcdef\@\@\@hostname'\n";
 close FILE;