← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/md5/md5.cc

Committer: Brian Aker
Date: 2009-07-29 15:08:30 UTC
mfrom: (1093.1.36 captain)
Revision ID: brian@gaz-20090729150830-8sckl9aatssf1xjd

Merge Jay

files added:
drizzled/temporal_interval.cc

drizzled/temporal_interval.h

files removed:
drizzled/function/time/get_interval_value.cc

drizzled/function/time/get_interval_value.h

files modified:
drizzled/Makefile.am

drizzled/function/time/date_add_interval.cc

drizzled/server_includes.h

drizzled/structs.h

drizzled/time.cc

gnulib/Makefile.am

gnulib/time.in.h

m4/mktime.m4

m4/pandora_64bit.m4

m4/pandora_canonical.m4

m4/pandora_have_libpq.m4

m4/time_h.m4

plugin/md5/md5.cc

tests/suite/big/r/read_many_rows_innodb.result

tests/suite/big/t/read_many_rows_innodb.test

Show diffs side-by-side

added added

removed removed

plugin/md5/md5.cc

19

19

#include <drizzled/item/func.h>

20

20

#include <drizzled/function/str/strfunc.h>

21

21

22

#if defined(HAVE_GNUTLS_OPENSSL)

22

#if defined(HAVE_LIBGNUTLS_OPENSSL)

23

23

# include <gnutls/openssl.h>

24

24

#else

25

25

# include <openssl/md5.h>

Older »