Commit a2fc5874 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/d2/hf/common/my50-common 

into  mysql.com:/d2/hf/common/my51-common


libmysqld/lib_sql.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
parents b0fbbf6b 44e02393

There are no changes