summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc.rej
Commit message (Expand)AuthorAgeFilesLines
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-11-161-0/+17