Commit 44e02393 authored by unknown's avatar unknown

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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment