diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2005-01-19 16:24:06 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2005-01-19 16:24:06 +0400 |
| commit | 86f45f067cf065a942727d39cefc7c82b757c8cc (patch) | |
| tree | 9b8a3c01c9c3e08a1a6e297bf4bbd4770b2f0135 /sql/field_conv.cc | |
| parent | 894c9bd5349a6866fd74588d4aa60d3db0634e1c (diff) | |
| download | mariadb-git-86f45f067cf065a942727d39cefc7c82b757c8cc.tar.gz | |
ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED.
extra/comp_err.c:
WARN_PREFIX added.
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 07cc90283b7..002f059f70b 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -121,8 +121,7 @@ set_field_to_null(Field *field) field->reset(); if (current_thd->count_cuted_fields == CHECK_FIELD_WARN) { - field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_DATA_TRUNCATED, 1); + field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1); return 0; } if (!current_thd->no_errors) @@ -230,7 +229,7 @@ static void do_copy_not_null(Copy_field *copy) if (*copy->from_null_ptr & copy->from_bit) { copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_DATA_TRUNCATED, 1); + WARN_DATA_TRUNCATED, 1); copy->to_field->reset(); } else @@ -336,7 +335,7 @@ static void do_cut_string(Copy_field *copy) if (!my_isspace(system_charset_info, *ptr)) // QQ: ucs incompatible { copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_DATA_TRUNCATED, 1); + WARN_DATA_TRUNCATED, 1); break; } } @@ -360,7 +359,7 @@ static void do_varstring1(Copy_field *copy) length=copy->to_length - 1; if (current_thd->count_cuted_fields) copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_DATA_TRUNCATED, 1); + WARN_DATA_TRUNCATED, 1); } *(uchar*) copy->to_ptr= (uchar) length; memcpy(copy->to_ptr+1, copy->from_ptr + 1, length); @@ -375,7 +374,7 @@ static void do_varstring2(Copy_field *copy) length=copy->to_length-HA_KEY_BLOB_LENGTH; if (current_thd->count_cuted_fields) copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_DATA_TRUNCATED, 1); + WARN_DATA_TRUNCATED, 1); } int2store(copy->to_ptr,length); memcpy(copy->to_ptr+HA_KEY_BLOB_LENGTH, copy->from_ptr + HA_KEY_BLOB_LENGTH, |