← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/double.cc

  • Committer: Lee Bieber
  • Date: 2010-10-27 18:28:56 UTC
  • mfrom: (1883.1.3 build)
  • Revision ID: kalebral@gmail.com-20101027182856-q3wqtbv1t4egkjsk
Merge Andrew - fix bug 667360: --defaults-file not processed before paths read           
Merge Andrew - fix bug 656577: Importing SQL script results in silent failure    
Merge Andrew - fix bug 667053: drizzledump minor output cleanup needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/double.cc
133
133
    char buf[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
134
134
    String tmp(buf, sizeof(buf), &my_charset_utf8_general_ci), *str;
135
135
    str= val_str(&tmp, &tmp);
136
 
    Session *session= getTable() ? getTable()->in_use : current_session;
137
 
    push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
136
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
138
137
                        ER_TRUNCATED_WRONG_VALUE,
139
138
                        ER(ER_TRUNCATED_WRONG_VALUE), "INTEGER",
140
139
                        str->c_ptr());