Commit 8dbc6b1f authored by unknown's avatar unknown

Merge mysql.com:/usr/home/bar/mysql-4.1

into  mysql.com:/usr/home/bar/mysql-5.0


strings/conf_to_src.c:
  Auto merged
parents cabe2859 fafa4c5a
This diff is collapsed.
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