Commit be6732f9 authored by unknown's avatar unknown

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-topush

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-topush


mysys/string.c:
  Auto merged
parents 9d495f38 413e5414
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