← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/field/num.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/num.cc
74
74
    char buff[128];
75
75
    String tmp(buff, (uint32_t) sizeof(buff), system_charset_info);
76
76
    tmp.copy(str, length, system_charset_info);
77
 
    push_warning_printf(table->in_use, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
77
    push_warning_printf(getTable()->in_use, DRIZZLE_ERROR::WARN_LEVEL_WARN,
78
78
                        ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
79
79
                        ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
80
80
                        "integer", tmp.c_ptr(), field_name,
81
 
                        (uint32_t) table->in_use->row_count);
 
81
                        (uint32_t) getTable()->in_use->row_count);
82
82
    return 1;
83
83
  }
84
84
  /* Test if we have garbage at the end of the given string. */
132
132
    goto out_of_range;
133
133
  }
134
134
 
135
 
  if (table->in_use->count_cuted_fields &&
 
135
  if (getTable()->in_use->count_cuted_fields &&
136
136
      check_int(cs, from, len, end, error))
137
137
    return 1;
138
138
  return 0;