← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Padraig O'Sullivan
  • Date: 2009-09-17 00:08:20 UTC
  • mto: (1126.9.3 captain-20090915-01)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: osullivan.padraig@gmail.com-20090917000820-urd6p46qngi1okjp
Updated calls to some dtrace probes to cast the parameter to const char *
appropriately. Also, removed the additional variable in places that I was
using.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/now.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/time/now.h>
23
23
#include <drizzled/session.h>
24
24
 
25
25
#include "drizzled/temporal.h"
26
26
 
27
 
namespace drizzled
28
 
{
29
 
 
30
27
String *Item_func_now::val_str(String *)
31
28
{
32
29
  assert(fixed == 1);
90
87
  now_time->second= cached_temporal.seconds();
91
88
}
92
89
 
93
 
bool Item_func_now::get_temporal(DateTime &to)
 
90
bool Item_func_now::get_temporal(drizzled::DateTime &to)
94
91
{
95
92
  to= cached_temporal;
96
93
  return true;
110
107
  return to->store_time(&ltime, DRIZZLE_TIMESTAMP_DATETIME);
111
108
}
112
109
 
113
 
} /* namespace drizzled */