Commit 8baded90 authored by unknown's avatar unknown
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  romeo.(none):/home/bkroot/mysql-5.1-rpl


sql/mysqld.cc:
  Auto merged
parents 6277365f 796c53ea

There are no changes