← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
54
54
#include <float.h>
55
55
 
56
56
using namespace std;
57
 
using namespace drizzled;
 
57
 
 
58
namespace drizzled
 
59
{
58
60
 
59
61
const String my_null_string("NULL", 4, default_charset_info);
60
62
 
467
469
    if (number_to_datetime(value, ltime, fuzzydate, &was_cut) == -1L)
468
470
    {
469
471
      char buff[22], *end;
470
 
      end= int64_t10_to_str(value, buff, -10);
 
472
      end= internal::int64_t10_to_str(value, buff, -10);
471
473
      make_truncated_value_warning(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
472
474
                                   buff, (int) (end-buff), DRIZZLE_TIMESTAMP_NONE,
473
475
                                   NULL);
1774
1776
  }
1775
1777
}
1776
1778
 
 
1779
} /* namespace drizzled */