diff options
| author | unknown <timour@mysql.com> | 2005-10-03 22:02:22 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-10-03 22:02:22 +0300 |
| commit | 5672f913c248bb5e09bb7d5d622410dfe074fdf7 (patch) | |
| tree | b00d3f9ec6d7680497c677594748cd528a256962 /sql/item.h | |
| parent | 0e62189b0930a282527a60e0f954c46f8b5ef44e (diff) | |
| parent | 20c77c32e3389b748483b295871ae88190c733f6 (diff) | |
| download | mariadb-git-5672f913c248bb5e09bb7d5d622410dfe074fdf7.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-13410
sql/item.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 4980ea41ee7..a8f013f60d4 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1622,7 +1622,7 @@ public: } Item *real_item() { - return (*ref)->real_item(); + return (ref && *ref) ? (*ref)->real_item() : this; } bool walk(Item_processor processor, byte *arg) { return (*ref)->walk(processor, arg); } |