← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/md5/md5.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/md5/md5.cc
14
14
   along with this program; if not, write to the Free Software
15
15
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
16
16
 
17
 
#include "config.h"
 
17
#include <config.h>
18
18
 
19
19
#include <cstdio>
20
20
#include <cstddef>
22
22
#include <gcrypt.h>
23
23
 
24
24
#include <drizzled/charset.h>
25
 
#include <drizzled/charset_info.h>
26
25
#include <drizzled/function/str/strfunc.h>
27
26
#include <drizzled/item/func.h>
28
27
#include <drizzled/plugin/function.h>
61
60
  assert(fixed == true);
62
61
 
63
62
  String *sptr= args[0]->val_str(str);
64
 
  if (sptr == NULL || str->alloc(32)) 
 
63
  if (sptr == NULL) 
65
64
  {
66
65
    null_value= true;
67
66
    return 0;
68
67
  }
 
68
  str->alloc(32);
69
69
 
70
70
  null_value= false;
71
71