From: Date: August 13 2008 8:12pm
Subject: bzr push into mysql-6.0-bugteam branch (marc.alff:2758 to 2759) Bug#37402
List-Archive: http://lists.mysql.com/commits/51551
X-Bug: 37402
Message-Id: <20080813181250.BCCDE2D875@lambda.WEBLAB>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2759 Marc Alff	2008-08-13 [merge]
      Merge 5.1-bugteam -> 6.0-bugteam
      
      This is a NULL merge to resolve bzr conflicts,
      the file contents were already merged separately

 2758 Marc Alff	2008-08-13 [merge]
      Merge 5.1-bugteam -> 6.0-bugteam
      
      Manual merge of sql_yacc.yy
modified:
  sql/sql_cursor.cc
  sql/sql_yacc.yy
  tests/mysql_client_test.c