diff options
| author | unknown <gshchepa/uchum@gshchepa.loc> | 2007-04-20 15:31:33 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gshchepa.loc> | 2007-04-20 15:31:33 +0500 |
| commit | a501fdd695a43905d89d7eb9157d3757d75f79bc (patch) | |
| tree | bdf1e76b1cbfea7cafc8a0d548a68d660c6b51e2 /sql/item_cmpfunc.h | |
| parent | 5b0ec8709ad4946260e257916a31d213b6168d26 (diff) | |
| parent | a8f639fccc19ef80d67c52e698bf6366fdcf6f94 (diff) | |
| download | mariadb-git-a501fdd695a43905d89d7eb9157d3757d75f79bc.tar.gz | |
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/row.test:
Auto merged
mysql-test/r/row.result:
Test case updated for Bug#27704 (incorrect comparison
of rows with NULL components).
sql/item_cmpfunc.cc:
Bug#27704: incorrect comparison of rows with NULL components.
sql/item_cmpfunc.h:
Bug#27704: incorrect comparison of rows with NULL components.
Cosmetic fix.
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 0c4a62aaa24..11b8d34ad65 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -333,7 +333,7 @@ public: bool is_bool_func() { return 1; } CHARSET_INFO *compare_collation() { return cmp.cmp_collation.collation; } uint decimal_precision() const { return 1; } - void top_level_item() { abort_on_null=1; } + void top_level_item() { abort_on_null= TRUE; } friend class Arg_comparator; }; |