Commit 2a480ced authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/25492/my50-25492 

into  mysql.com:/home/hf/work/25492/my51-25492


libmysqld/lib_sql.cc:
  Auto merged
parents 5b64b12c b745f117

There are no changes