summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-10-16 10:32:45 +0300
committerunknown <monty@hundin.mysql.fi>2002-10-16 10:32:45 +0300
commitb3e3a09e726501dc1147563725dc80f718467e70 (patch)
treeb2749496347a8bc7352927d95fef69660bb47fe3 /sql/item.h
parentcba8acc1af1e4874fafe0955e57815c0f8c2b5ad (diff)
downloadmariadb-git-b3e3a09e726501dc1147563725dc80f718467e70.tar.gz
Fixed bug in LEFT JOIN ... WHERE not_null_key_column=NULL;
Docs/manual.texi: ChangeLog sql/field.h: New virtual function to set a field to null or signal an error sql/field_conv.cc: New function to set a field to null or signal an error sql/item.cc: When setting a field to null internally (for WHERE testing) don't autoconvert NULL -> now() or last_insert_id() sql/item.h: New virtual function to set a field to null or signal an error
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index b8903756027..408010d211a 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -55,6 +55,8 @@ public:
virtual bool save_in_field(Field *field);
virtual void save_org_in_field(Field *field)
{ (void) save_in_field(field); }
+ virtual bool save_safe_in_field(Field *field)
+ { return save_in_field(field); }
virtual bool send(String *str);
virtual bool eq(const Item *, bool binary_cmp) const;
virtual Item_result result_type () const { return REAL_RESULT; }
@@ -144,6 +146,7 @@ public:
String *val_str(String *str);
void make_field(Send_field *field);
bool save_in_field(Field *field);
+ bool save_safe_in_field(Field *field);
enum Item_result result_type () const
{ return STRING_RESULT; }
bool send(String *str);