Commit 23d9d63d authored by unknown's avatar unknown

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 1d28a6ae 3dae7ac8
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment