← 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: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

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