Commit e6cd371d authored by unknown's avatar unknown

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/field.cc:
  Auto merged
parents f155c174 509d07bf
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