Commit 1dc9e5a6 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 6db6be5a 04b64f00

There are no changes