From: Date: June 28 2008 2:11am
Subject: bzr push into mysql-5.1 branch (timothy.smith:2679 to 2680) Bug#20748
List-Archive: http://lists.mysql.com/commits/48691
X-Bug: 20748
Message-Id: <20080628001159.3B5EE803D1@ramayana.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2680 Timothy Smith	2008-06-27 [merge]
      Up-merge from 5.0: Merge from upstream (my:5.0-bugteam)

 2679 Timothy Smith	2008-06-27 [merge]
      Up-merge from 5.0: Fix for Bug#20748, Configuration files should not be read more than once
      
      Differences in 5.1: include "/etc/mysql/" in include directories; no OS/2 support.
modified:
  mysys/default.c