diff options
| author | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-05-12 05:32:06 +0100 |
|---|---|---|
| committer | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-05-12 05:32:06 +0100 |
| commit | 79c1c8e586ae07d4634e0773b7bbfbde8c7003ce (patch) | |
| tree | d611865cd1118eb2c5e0f440c83864f9e590f50f /sql/field.cc | |
| parent | a0f300a6d3ee5736baedf90a82b4ba65305f3917 (diff) | |
| parent | efc20dca0028d75fc6183cde50dd55de01acf7ec (diff) | |
| download | mariadb-git-79c1c8e586ae07d4634e0773b7bbfbde8c7003ce.tar.gz | |
auto-merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 0d831aef8b3..d273f26306d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5382,6 +5382,7 @@ double Field_year::val_real(void) longlong Field_year::val_int(void) { ASSERT_COLUMN_MARKED_FOR_READ; + DBUG_ASSERT(field_length == 2 || field_length == 4); int tmp= (int) ptr[0]; if (field_length != 4) tmp%=100; // Return last 2 char @@ -5394,6 +5395,7 @@ longlong Field_year::val_int(void) String *Field_year::val_str(String *val_buffer, String *val_ptr __attribute__((unused))) { + DBUG_ASSERT(field_length < 5); val_buffer->alloc(5); val_buffer->length(field_length); char *to=(char*) val_buffer->ptr(); |