diff options
| author | acurtis@xiphis.org <> | 2005-08-11 12:18:53 +0100 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2005-08-11 12:18:53 +0100 |
| commit | b9476f7d50e9911ea83f304351e5cab7a3880089 (patch) | |
| tree | 7e424eae0123e35fa5eec3670a550a310c6e1916 /sql/item_cmpfunc.cc | |
| parent | 0f75d647349694d820923342325440e9abdd49a6 (diff) | |
| parent | 3b64651683a6f8d9276fd49843832f672312f880 (diff) | |
| download | mariadb-git-b9476f7d50e9911ea83f304351e5cab7a3880089.tar.gz | |
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into xiphis.org:/usr/home/antony/work2/merge-5.0
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index d430d0d3c23..261f719e502 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1903,6 +1903,8 @@ in_row::~in_row() byte *in_row::get_value(Item *item) { tmp.store_value(item); + if (item->is_null()) + return 0; return (byte *)&tmp; } |