diff options
| author | monty@mashka.mysql.fi <> | 2003-01-14 11:27:26 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-14 11:27:26 +0200 |
| commit | 8dd439e751f908af22ebd11197fd56ade76aa5fa (patch) | |
| tree | d53ba7e1a43cc73daf4f75fa37f9467d8792fd64 /sql/field_conv.cc | |
| parent | 1bc3105da34c174f1ffe848a01e9cfb0d4ebc2ec (diff) | |
| download | mariadb-git-8dd439e751f908af22ebd11197fd56ade76aa5fa.tar.gz | |
Guard against compiling without -fno-exceptions
Allocate bigger default thread stack because of problems with glibc
Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
Fixed bug in replication when using auto_increment and LOAD DATA INFILE
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index ffc93f3e871..42272dd616f 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -118,6 +118,15 @@ set_field_to_null(Field *field) field->reset(); return 0; } + field->reset(); + if (current_thd->count_cuted_fields) + { + current_thd->cuted_fields++; // Increment error counter + return 0; + } + if (!current_thd->no_errors) + my_printf_error(ER_BAD_NULL_ERROR,ER(ER_BAD_NULL_ERROR),MYF(0), + field->field_name); return 1; } |