Fixed compiler warning

client/mysql.cc:
  Fixed compiler warning
include/my_global.h:
  Fixed typo
storage/maria/ha_maria.cc:
  Merge