Commit 04e727c7 authored by unknown's avatar unknown
Browse files

Merge mockturtle.local:/home/dlenev/src/mysql-4.1-bg25966 

into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2


sql/mysqld.cc:
  Auto merged
parents cdd2a2e4 db1d2f64

There are no changes