← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/plugin_ms.cc

  • Committer: Lee Bieber
  • Date: 2011-01-25 20:11:28 UTC
  • mfrom: (2114.1.5 build)
  • Revision ID: kalebral@gmail.com-20110125201128-zhhu9kgcmmv2p11y
Merge Lee - 706121: innodb.innodb_bug53756.test relies on functionality not provided by test-run.pl
Merge Monty - Added inter-plugin dependencies for controlling plugin load order
Merge Marisa - 684803: Need to update Drizzledump documentation with migration conversions / caveats
Merge Marisa - 686641: Need to document removal of multi-table update/delete from Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/plugin_ms.cc
87
87
        "The Media Stream daemon for Drizzle",
88
88
        PLUGIN_LICENSE_GPL,
89
89
        my_init, /* Plugin Init */
90
 
        NULL,          /* system variables                */
 
90
        NULL,          /* depends */
91
91
        init_options                                            /* config options                  */
92
92
}
93
93
DRIZZLE_DECLARE_PLUGIN_END;
115
115
        0x0001 /* 0.1 */,
116
116
        NULL,                                                                                   /* status variables                                                             */
117
117
#if MYSQL_VERSION_ID >= 50118
118
 
        pbms_system_variables,                                                  /* system variables                                                             */
 
118
        pbms_system_variables,                                                  /* depends */
119
119
#else
120
120
        NULL,
121
121
#endif