← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/loader.cc

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/loader.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#include <drizzled/server_includes.h>
17
 
#include <mysys/my_getopt.h>
18
 
#include <mysys/hash.h>
 
16
#include "drizzled/server_includes.h"
19
17
 
20
 
#include <drizzled/sql_parse.h>
21
 
#include <drizzled/replication_services.h>
22
 
#include <drizzled/show.h>
23
 
#include <drizzled/handler.h>
24
 
#include <drizzled/set_var.h>
25
 
#include <drizzled/session.h>
26
 
#include <drizzled/item/null.h>
27
 
#include <drizzled/plugin/registry.h>
28
 
#include "drizzled/plugin/config.h"
 
18
#include <dlfcn.h>
29
19
 
30
20
#include <string>
31
21
#include <vector>
32
22
#include <map>
33
23
#include <algorithm>
34
24
 
35
 
#include <drizzled/error.h>
36
 
#include <drizzled/gettext.h>
37
 
 
38
 
#define REPORT_TO_LOG  1
39
 
#define REPORT_TO_USER 2
 
25
#include "mysys/my_getopt.h"
 
26
#include "mysys/hash.h"
 
27
 
 
28
#include "drizzled/plugin/config.h"
 
29
#include "drizzled/sql_parse.h"
 
30
#include "drizzled/show.h"
 
31
#include "drizzled/cursor.h"
 
32
#include "drizzled/set_var.h"
 
33
#include "drizzled/session.h"
 
34
#include "drizzled/item/null.h"
 
35
#include "drizzled/plugin/registry.h"
 
36
#include "drizzled/error.h"
 
37
#include "drizzled/gettext.h"
 
38
#include "drizzled/errmsg_print.h"
 
39
 
 
40
 
 
41
/* FreeBSD 2.2.2 does not define RTLD_NOW) */
 
42
#ifndef RTLD_NOW
 
43
#define RTLD_NOW 1
 
44
#endif
40
45
 
41
46
using namespace std;
42
47
using namespace drizzled;
43
48
 
 
49
static const int REPORT_TO_LOG= 1;
 
50
static const int REPORT_TO_USER= 2;
 
51
 
44
52
typedef plugin::Manifest builtin_plugin[];
45
53
extern builtin_plugin PANDORA_BUILTIN_LIST;
46
54
static plugin::Manifest *drizzled_builtins[]=
47
55
{
48
 
  PANDORA_BUILTIN_LIST,(plugin::Manifest *)NULL
 
56
  PANDORA_BUILTIN_LIST, NULL
49
57
};
 
58
 
50
59
class sys_var_pluginvar;
51
60
static vector<sys_var_pluginvar *> plugin_sysvar_vec;
52
61