← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2008-11-03 21:00:47 UTC
  • mfrom: (520.9.5 devel)
  • Revision ID: brian@tangent.org-20081103210047-wfkeyyefrfl2vh4l
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
522
522
  {"open_files_limit",        (char*) &open_files_limit,            SHOW_LONG},
523
523
  {"pid_file",                (char*) pidfile_name,                 SHOW_CHAR},
524
524
  {"plugin_dir",              (char*) opt_plugin_dir,               SHOW_CHAR},
525
 
  {"port",                    (char*) &mysqld_port,                 SHOW_INT},
 
525
  {"port",                    (char*) &drizzled_port,               SHOW_INT},
526
526
  {"protocol_version",        (char*) &protocol_version,            SHOW_INT},
527
527
  {"thread_stack",            (char*) &my_thread_stack_size,        SHOW_LONG},
528
528
};