Commit 4a929b6d authored by joerg@mysql.com's avatar joerg@mysql.com

Auto / manual merge from 4.0.26 (bypassing intermediate trees, due to unmerged changes).

parents 89e8df28 5b65d8fb
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