Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

   "Log updates to file.# where # is a unique number if not given.",

   (gptr*) &opt_update_logname, (gptr*) &opt_update_logname, 0, GET_STR,

   OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"log-warnings", 'W', "Log some not critical warnings to the log file. Use this option twice, or --log-warnings=2 if you want 'Aborted connections' warning to be logged in the error log file.",

  {"log-warnings", 'W', "Log some non-critical warnings to the error log file. Use this option twice or --log-warnings=2 if you also want 'Aborted connections' warnings.",

   (gptr*) &global_system_variables.log_warnings,

   (gptr*) &max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG, 1, 0, 0,

   0, 0, 0},