Commit 05e26b12 authored by unknown's avatar unknown

Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
parents e8ba23fd e93dc829
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