summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authoracurtis/antony@ltamd64.xiphis.org <>2007-05-04 23:35:14 -0700
committeracurtis/antony@ltamd64.xiphis.org <>2007-05-04 23:35:14 -0700
commita4dbc0990cc2f89a1b7f256f6d1d838f25f070c4 (patch)
tree56b4a36694de3fd3fdb494ae00d38cd3f38d7c3d /sql/item_sum.cc
parent5558019733b64303837c6428a215d69f21bdf971 (diff)
parent0f0ef2fe14dd3082808b767abb6a995f255183c5 (diff)
downloadmariadb-git-a4dbc0990cc2f89a1b7f256f6d1d838f25f070c4.tar.gz
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 2eced347650..6215aacde64 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -2491,7 +2491,7 @@ bool Item_sum_count_distinct::setup(THD *thd)
table->file->extra(HA_EXTRA_NO_ROWS); // Don't update rows
table->no_rows=1;
- if (table->s->db_type == heap_hton)
+ if (table->s->db_type() == heap_hton)
{
/*
No blobs, otherwise it would have been MyISAM: set up a compare