diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 16:34:29 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 16:34:29 +0300 |
| commit | 6f38e3083f0d867af8d1499fba92c7eaae295726 (patch) | |
| tree | 7e8b3a279aef52d26da9843f1c45ff38112391f2 /sql/item.h | |
| parent | 266e42b24cf1837cde602811dccf63e0395bbe5c (diff) | |
| parent | 7013d8ef0ae0a21fadfcc0a159ee1d83fdad8a9d (diff) | |
| download | mariadb-git-6f38e3083f0d867af8d1499fba92c7eaae295726.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 70729afe28e..246e1fbcbd6 100644 --- a/sql/item.h +++ b/sql/item.h @@ -56,6 +56,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(THD *thd, String *str); virtual bool eq(const Item *, bool binary_cmp) const; virtual Item_result result_type () const { return REAL_RESULT; } @@ -154,6 +156,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(THD *thd, String *str); |