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