← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/md5/md5.cc

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/md5/md5.cc
21
21
 
22
22
#include <gcrypt.h>
23
23
 
24
 
#include <drizzled/charset.h>
25
 
#include <drizzled/charset_info.h>
 
24
#include <drizzled/plugin/function.h>
 
25
#include <drizzled/item/func.h>
 
26
#include "drizzled/charset.h"
26
27
#include <drizzled/function/str/strfunc.h>
27
 
#include <drizzled/item/func.h>
28
 
#include <drizzled/plugin/function.h>
29
28
 
30
29
using namespace std;
31
30
using namespace drizzled;
97
96
  /* Initialize libgcrypt */
98
97
  if (not gcry_check_version(GCRYPT_VERSION))
99
98
  {
100
 
    errmsg_printf(error::ERROR, _("libgcrypt library version mismatch"));
 
99
    errmsg_printf(ERRMSG_LVL_ERROR, _("libgcrypt library version mismatch\n"));
101
100
    return 1;
102
101
  }
103
102
  /* Disable secure memory.  */
120
119
  "UDF for computing md5sum",
121
120
  PLUGIN_LICENSE_GPL,
122
121
  initialize, /* Plugin Init */
123
 
  NULL,   /* depends */
 
122
  NULL,   /* system variables */
124
123
  NULL    /* config options */
125
124
}
126
125
DRIZZLE_DECLARE_PLUGIN_END;