diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 19:00:33 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 19:00:33 +0400 |
| commit | 637c7529dec0fcc820fab0753679f94f31260a1e (patch) | |
| tree | 20b533d22ea39c933ac382d5309f7502783298e9 /sql/item_cmpfunc.cc | |
| parent | d88a11a76687b8c7ae4cb0642a0977b7ca420ad0 (diff) | |
| parent | f563a012cebf217f32710b6d07f6b1ea58431146 (diff) | |
| download | mariadb-git-637c7529dec0fcc820fab0753679f94f31260a1e.tar.gz | |
Manual merge of the fix for bug #54190 and the addendum patch
to 5.5 (removed one test case as it is no longer valid).
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 adecc19a122..efbd99c4106 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1595,6 +1595,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++) { |