mysqld.cc:

  System variable names use underscores, not dashes.
  Alphabetize variables in option struct for help message.

(will wait for okay to push)