Commit 8b4b8eab authored by unknown's avatar unknown

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

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


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
parents 3d87df86 381bfc8a
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