Old option ordering in the help was confusing to some users.  Changed
ordering of deprecated options to be consistent, and added mention to
entry for options with a "--no-option" variant mentioning the
"--disable-option" variant.


client/mysql.cc:
  Rearranged options for clarity.  Deprecated "--no-X" options now
  follow the "--X" option, and all of the "--X" options that have a
  "--no-X" variant now mention the "--disable-X" variant.