Commit 44e02393 authored by unknown's avatar unknown
Browse files

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

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


libmysqld/lib_sql.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
parents bf075d82 ca98fb63

There are no changes