Commit 5ee271c7 authored by unknown's avatar unknown

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/ps_7ndb.result:
  Auto merged
parents 9dc63bf2 786daf13
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