diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-01 14:38:38 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-01 14:38:38 +0300 |
| commit | 23a9a5805cd258c5699e782cebdb5763acb1d85d (patch) | |
| tree | 624e1dedb3475d160136c91bf352c5b698a469e8 /sql/field_conv.cc | |
| parent | 0fe578f52a7b699cc4ff726428c9701530d9f827 (diff) | |
| download | mariadb-git-23a9a5805cd258c5699e782cebdb5763acb1d85d.tar.gz | |
Optimized old patches
Don't set field to DEFAULT value when set to NULL
mysql-test/r/insert.result:
Updated results after patch
sql/field_conv.cc:
Revert patch: Don't set field to DEFAULT value when set to NULL
sql/item_strfunc.cc:
Optimized patch for null handling with elt
sql/opt_range.cc:
Safety fix for range with null patch
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index ce67455881b..db0cc71c6bf 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2003 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -118,7 +118,7 @@ set_field_to_null(Field *field) field->reset(); return 0; } - field->set_default(); + field->reset(); if (current_thd->count_cuted_fields) { current_thd->cuted_fields++; // Increment error counter @@ -170,7 +170,7 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions) ((Field_timestamp*) field)->set_time(); return 0; // Ok to set time to NULL } - field->set_default(); + field->reset(); if (field == field->table->next_number_field) return 0; // field is set in handler.cc if (current_thd->count_cuted_fields) |