revert 48525

1 files changed, 8 insertions, 18 deletions

diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 0bffde9671a..3574534722e 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -122,18 +122,13 @@ set_field_to_null(Field *field)
     return 0;
   }
   field->reset();
-  switch (field->table->in_use->count_cuted_fields) {
-  case CHECK_FIELD_WARN:
+  if (field->table->in_use->count_cuted_fields == CHECK_FIELD_WARN)
+  {
     field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
-    /* fall through */
-  case CHECK_FIELD_IGNORE:
     return 0;
-  case CHECK_FIELD_ERROR_FOR_NULL:
-    if (!field->table->in_use->no_errors)
-      my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
-    return -1;
   }
-  DBUG_ASSERT(0); // impossible
+  if (!field->table->in_use->no_errors)
+    my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
   return -1;
 }
 
@@ -183,18 +178,13 @@ 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 fill_record()
   }
-  switch (field->table->in_use->count_cuted_fields) {
-  case CHECK_FIELD_WARN:
+  if (field->table->in_use->count_cuted_fields == CHECK_FIELD_WARN)
+  {
     field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_BAD_NULL_ERROR, 1);
-    /* fall through */
-  case CHECK_FIELD_IGNORE:
     return 0;
-  case CHECK_FIELD_ERROR_FOR_NULL:
-    if (!field->table->in_use->no_errors)
-      my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
-    return -1;
   }
-  DBUG_ASSERT(0); // impossible
+  if (!field->table->in_use->no_errors)
+    my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
   return -1;
 }