diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-11 23:26:39 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-11 23:26:39 +0300 |
| commit | 0cdddbf144de80d1c4da00ee681632bc0ac6c7c9 (patch) | |
| tree | ef3d1cebc764d28840dd77ecb91ade0a6f1b593e /sql/field_conv.cc | |
| parent | 617e09abcf4d0b41283bd423f32415d7f4459e9e (diff) | |
| download | mariadb-git-0cdddbf144de80d1c4da00ee681632bc0ac6c7c9.tar.gz | |
Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)
mysql-test/r/ctype_mb.result:
update results after adding more warnings
mysql-test/r/null.result:
update results after adding more warnings
mysql-test/r/select_found.result:
update results after adding more warnings
mysql-test/r/warnings.result:
update results after adding more warnings
mysql-test/t/ctype_mb.test:
Add missing drop table
mysql-test/t/myisam.test:
Disable some warnings
mysql-test/t/select_found.test:
update results after adding more warnings
sql/field_conv.cc:
Add warnings for single line inserts
sql/item_func.cc:
Remove compile warnings
sql/sql_class.cc:
Add warnings for single line inserts
sql/sql_class.h:
Add warnings for single line inserts
sql/sql_insert.cc:
Add warnings for single line inserts
sql/sql_load.cc:
Add warnings for single line inserts
sql/sql_select.cc:
Add warnings for single line inserts
sql/sql_table.cc:
Add warnings for single line inserts
sql/sql_update.cc:
Add warnings for single line inserts
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 6510a03f5a6..5f08c91372b 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -119,7 +119,7 @@ set_field_to_null(Field *field) return 0; } field->reset(); - if (current_thd->count_cuted_fields) + if (current_thd->count_cuted_fields == CHECK_FIELD_WARN) { field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,ER_WARN_DATA_TRUNCATED); return 0; @@ -176,7 +176,7 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions) field->table->auto_increment_field_not_null= false; return 0; // field is set in handler.cc } - if (current_thd->count_cuted_fields) + if (current_thd->count_cuted_fields == CHECK_FIELD_WARN) { field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,ER_WARN_NULL_TO_NOTNULL); return 0; |