diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 16:48:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 16:48:06 +0400 |
| commit | df198b5f6af95b56cb6440b18097f03c3b2dde65 (patch) | |
| tree | 7de606941c1bb9a49cc8ff9491c72147b48f72c9 /sql/item_cmpfunc.cc | |
| parent | babebf9cebd2218fcc29e7d0cdbecb501f6fec30 (diff) | |
| parent | 9066714c817fc0816333cde52bead2652125d118 (diff) | |
| download | mariadb-git-df198b5f6af95b56cb6440b18097f03c3b2dde65.tar.gz | |
Automerge.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 605d12742f8..6987dd9e053 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1583,6 +1583,13 @@ int Arg_comparator::compare_row() bool was_null= 0; (*a)->bring_value(); (*b)->bring_value(); + + if ((*a)->null_value || (*b)->null_value) + { + owner->null_value= 1; + return -1; + } + uint n= (*a)->cols(); for (uint i= 0; i<n; i++) { |