diff options
| author | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-05-04 23:35:14 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-05-04 23:35:14 -0700 |
| commit | 72e0d8b40bcc9f7969eaf937bfcb4b34d114916c (patch) | |
| tree | 56b4a36694de3fd3fdb494ae00d38cd3f38d7c3d /sql/item_sum.cc | |
| parent | 70d440ace34f3897c8930975069cc960df47fc6e (diff) | |
| parent | cd3ced79e9670f3dead8d4613d697f8c01db3d48 (diff) | |
| download | mariadb-git-72e0d8b40bcc9f7969eaf937bfcb4b34d114916c.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
manual change to new api
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
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 |