← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

[patch 112/129] Merge patch for revision 1925 from InnoDB SVN:
revno: 1925
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6169
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6163
committer: calvin
timestamp: Thu 2009-11-12 12:40:43 +0000
message:
  branches/zip: add test case for bug#46676
  
  This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
  But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
  Add test case to catch future regression.
added:
  mysql-test/innodb_bug46676.result 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.result
  mysql-test/innodb_bug46676.test 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.test
diff:
=== added file 'mysql-test/innodb_bug46676.result'

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/plugin_ms.cc
28
28
#include <drizzled/common.h>
29
29
#include <drizzled/plugin.h>
30
30
#include <drizzled/session.h>
31
 
#include <boost/program_options.hpp>
32
 
#include <drizzled/module/option_map.h>
33
31
using namespace drizzled;
34
32
using namespace drizzled::plugin;
35
 
namespace po= boost::program_options;
36
33
 
37
34
#include "cslib/CSConfig.h"
38
35
#else
48
45
 
49
46
 
50
47
#include "defs_ms.h"
51
 
#include "pbmslib.h"
 
48
 
52
49
 
53
50
/////////////////////////
54
51
// Plugin Definition:
57
54
#include "events_ms.h"
58
55
static PBMSEvents *pbms_events= NULL;
59
56
 
 
57
 
60
58
extern int pbms_init_func(module::Context &registry);
61
 
 
62
 
static void init_options(module::option_context &context)
63
 
{
64
 
        PBMSParameters::initOptions(context);
65
 
}
66
 
 
67
 
static int my_init(module::Context &context)
 
59
extern struct drizzled::drizzle_sys_var* pbms_system_variables[];
 
60
 
 
61
static int my_init(module::Context &registry)
68
62
{
69
63
        int rtc;
70
 
 
71
 
        PBMSParameters::startUp(context);
72
 
        rtc = pbms_init_func(context);
 
64
        
 
65
        PBMSParameters::startUp();
 
66
        rtc = pbms_init_func(registry);
73
67
        if (rtc == 0) {
74
68
                pbms_events = new PBMSEvents();
75
 
                context.add(pbms_events);
 
69
                registry.add(pbms_events);
76
70
        }
77
 
 
 
71
        
78
72
        return rtc;
79
73
}
80
74
 
87
81
        "The Media Stream daemon for Drizzle",
88
82
        PLUGIN_LICENSE_GPL,
89
83
        my_init, /* Plugin Init */
90
 
        NULL,          /* system variables                */
91
 
        init_options                                            /* config options                  */
 
84
        pbms_system_variables,          /* system variables                */
 
85
        NULL                                            /* config options                  */
92
86
}
93
87
DRIZZLE_DECLARE_PLUGIN_END;
94
88
 
125
119
#endif //DRIZZLED
126
120
 
127
121
 
128
 
// vim:noexpandtab:sts=8:sw=8:tabstop=8:smarttab: