diff options
| author | unknown <timour@askmonty.org> | 2011-03-13 16:57:05 +0000 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2011-03-13 16:57:05 +0000 |
| commit | 3f944c43e984bbfd71ee0fd898c241e760f1836a (patch) | |
| tree | 00e6d6af4348e7f5b77cf9e41fe8c0a07c98652c /sql/sql_class.cc | |
| parent | edc69e3227dee351bd0dda7a835cb696ec502ba1 (diff) | |
| parent | 428b52f503f4325a12f4c606d9e6ebcd195eef82 (diff) | |
| download | mariadb-git-3f944c43e984bbfd71ee0fd898c241e760f1836a.tar.gz | |
Merge in the fix for LPBUG#730604, and a corrected fix for LP BUG#719198,
after Monty's review.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 7d9f5b5b3ed..f10655c3e51 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3104,7 +3104,7 @@ bool select_materialize_with_stats::send_data(List<Item> &items) while ((cur_item= item_it++)) { - if (cur_item->is_null()) + if (cur_item->is_null_result()) { ++cur_col_stat->null_count; cur_col_stat->max_null_row= count_rows; |