← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merged up with trunk properly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
57
57
# endif
58
58
#endif
59
59
 
60
 
#include <storage/myisam/ha_myisam.h>
 
60
#include <plugin/myisam/ha_myisam.h>
61
61
 
62
62
#ifdef HAVE_SYS_PRCTL_H
63
63
#include <sys/prctl.h>
2474
2474
   (char**) &opt_plugin_dir_ptr, (char**) &opt_plugin_dir_ptr, 0,
2475
2475
   GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
2476
2476
  {"plugin_load", OPT_PLUGIN_LOAD,
2477
 
   N_("Optional colon (or semicolon) separated list of plugins to load,"
2478
 
      "where each plugin is identified by the name of the shared library. "
2479
 
      "[for example: --plugin_load=libmd5udf.so:libauth_pam.so]"),
 
2477
   N_("Optional comma separated list of plugins to load at starup."
 
2478
      "[for example: --plugin_load=crc32,logger_gearman]"),
2480
2479
   (char**) &opt_plugin_load, (char**) &opt_plugin_load, 0,
2481
2480
   GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
2482
2481
  {"preload_buffer_size", OPT_PRELOAD_BUFFER_SIZE,