summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-03-08 21:49:15 +0200
committerunknown <monty@donna.mysql.fi>2001-03-08 21:49:15 +0200
commit740465fc5b8ddcac301d8f0e651e5b3a8be8f802 (patch)
tree03e32a721d028e31fabafbbc929c8e90341c86e2 /sql/field_conv.cc
parentb99a376c5b269217289954bbe2ed2784db9c2a7a (diff)
downloadmariadb-git-740465fc5b8ddcac301d8f0e651e5b3a8be8f802.tar.gz
Fixed bug in INSERT DELAYED when INSERT generated an error
Docs/manual.texi: Splitted INSERT syntax to different sub-sections mysql-test/r/delayed.result: Added new test that hanged INSERT DELAYED mysql-test/t/delayed.test: Added new test that hanged INSERT DELAYED scripts/mysqldumpslow.sh: Fix for new slow query log format sql/field_conv.cc: cleanup
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index aae9f18e6a0..606edd84c74 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -133,7 +133,8 @@ set_field_to_null(Field *field)
return 0;
}
if (!current_thd->no_errors)
- my_printf_error(ER_BAD_NULL_ERROR,ER(ER_BAD_NULL_ERROR),MYF(0),field->field_name);
+ my_printf_error(ER_BAD_NULL_ERROR,ER(ER_BAD_NULL_ERROR),MYF(0),
+ field->field_name);
return 1;
}
return 0;