← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/unix_timestamp.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
22
#include <drizzled/function/time/unix_timestamp.h>
23
23
#include <drizzled/field/epoch.h>
24
24
#include <drizzled/session.h>
25
25
 
26
 
#include <drizzled/temporal.h>
 
26
#include "drizzled/temporal.h"
27
27
 
28
28
namespace drizzled
29
29
{
34
34
 
35
35
  assert(fixed == 1);
36
36
  if (arg_count == 0)
37
 
    return (int64_t) getSession().getCurrentTimestampEpoch();
 
37
    return (int64_t) current_session->getCurrentTimestampEpoch();
38
38
 
39
39
  if (args[0]->type() == FIELD_ITEM)
40
40
  {                                             // Optimize timestamp field
41
41
    Field *field=((Item_field*) args[0])->field;
42
 
    if (field->is_timestamp())
 
42
    if (field->type() == DRIZZLE_TYPE_TIMESTAMP)
43
43
      return ((field::Epoch::pointer) field)->get_timestamp(&null_value);
44
44
  }
45
45