← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/fstring.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/fstring.cc
93
93
    char buf[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
94
94
    String tmp(buf, sizeof(buf), cs);
95
95
    tmp.copy((char*) ptr, field_length, cs);
96
 
    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
96
    push_warning_printf(current_thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
97
97
                        ER_TRUNCATED_WRONG_VALUE, 
98
98
                        ER(ER_TRUNCATED_WRONG_VALUE),
99
99
                        "DOUBLE", tmp.c_ptr());
118
118
    char buf[LONGLONG_TO_STRING_CONVERSION_BUFFER_SIZE];
119
119
    String tmp(buf, sizeof(buf), cs);
120
120
    tmp.copy((char*) ptr, field_length, cs);
121
 
    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
121
    push_warning_printf(current_thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
122
122
                        ER_TRUNCATED_WRONG_VALUE, 
123
123
                        ER(ER_TRUNCATED_WRONG_VALUE),
124
124
                        "INTEGER", tmp.c_ptr());
154
154
    CHARSET_INFO *cs= charset();
155
155
    String tmp(buf, sizeof(buf), cs);
156
156
    tmp.copy((char*) ptr, field_length, cs);
157
 
    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
157
    push_warning_printf(current_thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
158
158
                        ER_TRUNCATED_WRONG_VALUE, 
159
159
                        ER(ER_TRUNCATED_WRONG_VALUE),
160
160
                        "DECIMAL", tmp.c_ptr());