← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/timestamp_diff.cc

  • Committer: Brian Aker
  • Date: 2011-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/timestamp_diff.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
 
#include <drizzled/function/time/timestamp_diff.h>
23
 
#include <drizzled/time_functions.h>
 
22
#include "drizzled/function/time/timestamp_diff.h"
 
23
#include "drizzled/time_functions.h"
24
24
 
25
25
namespace drizzled
26
26
{
34
34
  int neg= 1;
35
35
 
36
36
  null_value= 0;
37
 
  if (args[0]->get_date(ltime1, TIME_NO_ZERO_DATE) ||
38
 
      args[1]->get_date(ltime2, TIME_NO_ZERO_DATE))
 
37
  if (args[0]->get_date(&ltime1, TIME_NO_ZERO_DATE) ||
 
38
      args[1]->get_date(&ltime2, TIME_NO_ZERO_DATE))
39
39
    goto null_date;
40
40
 
41
41
  if (calc_time_diff(&ltime2,&ltime1, 1,