diff options
| author | unknown <monty@mysql.com> | 2005-10-13 20:18:36 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-10-13 20:18:36 +0300 |
| commit | 762a5c88c9aa9e0f18d5b934fe9e00cba89794fd (patch) | |
| tree | ba7c54c43474d1eabf00b59bc53a89e94c8a51a8 /sql/item.cc | |
| parent | fba8a066b0a5b5c5578b6939a84d9687ac64f800 (diff) | |
| parent | f6d457d7e4bf6034274729a00c2b88b5fba98ce4 (diff) | |
| download | mariadb-git-762a5c88c9aa9e0f18d5b934fe9e00cba89794fd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 2fa77ac81c0..3d05cc19c08 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4644,7 +4644,7 @@ void Item_ref::cleanup() void Item_ref::print(String *str) { - if (ref && *ref) + if (ref) (*ref)->print(str); else Item_ident::print(str); @@ -4830,7 +4830,7 @@ void Item_ref::make_field(Send_field *field) void Item_ref_null_helper::print(String *str) { str->append("<ref_null_helper>(", 18); - if (ref && *ref) + if (ref) (*ref)->print(str); else str->append('?'); |