summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2004-09-18 01:10:09 +0400
committerunknown <konstantin@mysql.com>2004-09-18 01:10:09 +0400
commit52683755d3572722bdd32ffe7ae2e6d237d6066d (patch)
tree4fda0b8703de3f38c95d4d7ae20ac12a077cdcb9 /sql/item.cc
parentca65afeb72e7f514d51b7dcf2cc49e85a3b92677 (diff)
downloadmariadb-git-52683755d3572722bdd32ffe7ae2e6d237d6066d.tar.gz
A fix and test case for bug#5510 "inserting Null in AutoIncrement primary
key Column Fails". mysql-test/r/ps.result: Test results updated: a test case for Bug#5510 "inserting Null in AutoIncrement primary key Column Fails". mysql-test/r/ps_2myisam.result: Bug#5510: a different warning in case of NULL->default truncation.This is OK, the new warning is the same as produced by conventional execution. mysql-test/r/ps_3innodb.result: Bug#5510: a different warning in case of NULL->default truncation.This is OK, the new warning is the same as produced by conventional execution. mysql-test/r/ps_4heap.result: Bug#5510: a different warning in case of NULL->default truncation.This is OK, the new warning is the same as produced by conventional execution. mysql-test/r/ps_5merge.result: Bug#5510: a different warning in case of NULL->default truncation.This is OK, the new warning is the same as produced by conventional execution. mysql-test/r/ps_6bdb.result: Bug#5510: a different warning in case of NULL->default truncation.This is OK, the new warning is the same as produced by conventional execution. mysql-test/t/ps.test: A test case for Bug#5510 "inserting Null in AutoIncrement primary key Column Fails". sql/item.cc: A fix for bug#5510 "inserting Null in AutoIncrement primary key Column Fails": use proper Field API function for NULL placholeders.
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 8233d050783..14136435a50 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -891,7 +891,7 @@ int Item_param::save_in_field(Field *field, bool no_conversions)
return field->store(str_value.ptr(), str_value.length(),
str_value.charset());
case NULL_VALUE:
- return set_field_to_null(field);
+ return set_field_to_null_with_conversions(field, no_conversions);
case NO_VALUE:
default:
DBUG_ASSERT(0);