← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: pcrews
  • Date: 2011-05-24 17:36:24 UTC
  • mfrom: (1099.4.232 drizzle)
  • Revision ID: pcrews@lucid32-20110524173624-mwr1bvq6fa1r01ao
Updated translations + 2011.05.18 tarball tag

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/from_unixtime.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
#include <boost/lexical_cast.hpp>
22
 
#include "drizzled/function/time/from_unixtime.h"
23
 
#include "drizzled/session.h"
24
 
#include "drizzled/temporal.h"
25
 
#include "drizzled/time_functions.h"
 
22
#include <drizzled/function/time/from_unixtime.h>
 
23
#include <drizzled/current_session.h>
 
24
#include <drizzled/session.h>
 
25
#include <drizzled/temporal.h>
 
26
#include <drizzled/time_functions.h>
 
27
#include <drizzled/field.h>
26
28
 
27
29
#include <sstream>
28
30
#include <string>
48
50
  if (get_date(time_tmp, 0))
49
51
    return 0;
50
52
 
51
 
  if (str->alloc(type::Time::MAX_STRING_LENGTH))
52
 
  {
53
 
    null_value= 1;
54
 
    return 0;
55
 
  }
 
53
  str->alloc(type::Time::MAX_STRING_LENGTH);
56
54
 
57
55
  time_tmp.convert(*str);
58
56