~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2008-07-15 21:40:58 UTC
  • mfrom: (77.1.113 codestyle32)
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: mordred@camelot-20080715214058-rm3phulldos9xehv
Merged from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
947
947
      if builder specifically requested a default port, use that
948
948
      (even if it coincides with our factory default).
949
949
      only if they didn't do we check /etc/services (and, failing
950
 
      on that, fall back to the factory default of 3306).
 
950
      on that, fall back to the factory default of 4427).
951
951
      either default can be overridden by the environment variable
952
952
      MYSQL_TCP_PORT, which in turn can be overridden with command
953
953
      line options.
3022
3022
  OPT_SSL_CAPATH, OPT_SSL_CIPHER,
3023
3023
  OPT_BACK_LOG, OPT_BINLOG_CACHE_SIZE,
3024
3024
  OPT_CONNECT_TIMEOUT,
3025
 
  OPT_FLUSH_TIME, OPT_FT_MIN_WORD_LEN, OPT_FT_BOOLEAN_SYNTAX,
 
3025
  OPT_FLUSH_TIME,
3026
3026
  OPT_INTERACTIVE_TIMEOUT, OPT_JOIN_BUFF_SIZE,
3027
3027
  OPT_KEY_BUFFER_SIZE, OPT_KEY_CACHE_BLOCK_SIZE,
3028
3028
  OPT_KEY_CACHE_DIVISION_LIMIT, OPT_KEY_CACHE_AGE_THRESHOLD,