← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
45
45
#include "drizzled/time_functions.h"
46
46
#include "drizzled/internal/m_string.h"
47
47
 
48
 
using namespace drizzled;
 
48
namespace drizzled
 
49
{
49
50
 
50
51
/*****************************************************************************
51
52
  Instansiate templates and static variables
1143
1144
      set_warning(level, code, cuted_increment))
1144
1145
  {
1145
1146
    char str_nr[22];
1146
 
    char *str_end= int64_t10_to_str(nr, str_nr, -10);
 
1147
    char *str_end= internal::int64_t10_to_str(nr, str_nr, -10);
1147
1148
    make_truncated_value_warning(session, level, str_nr, (uint32_t) (str_end - str_nr),
1148
1149
                                 ts_type, field_name);
1149
1150
  }
1191
1192
  else
1192
1193
    table->clearWriteSet(field_index);
1193
1194
}
 
1195
 
 
1196
} /* namespace drizzled */