diff options
author | unknown <anozdrin/alik@ibm.> | 2008-01-19 22:32:48 +0300 |
---|---|---|
committer | unknown <anozdrin/alik@ibm.> | 2008-01-19 22:32:48 +0300 |
commit | b9ec8f6aba970ab4ae4da7b8281dd6e520cc941e (patch) | |
tree | e55cc90ad546ff1606eb9c8a3fac816a5662827e /sql/item_sum.cc | |
parent | 37ff91b3bfdb946743e36ddd13bfda71598f45a8 (diff) | |
parent | bab13c892d75f704cde64df7252620f4680b3722 (diff) | |
download | mariadb-git-b9ec8f6aba970ab4ae4da7b8281dd6e520cc941e.tar.gz |
Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1
configure.in:
Auto merged
client/mysqldump.c:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
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/unireg.cc:
Auto merged
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 881f472d766..0928ac068df 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2603,7 +2603,7 @@ void Item_sum_count_distinct::clear() else if (table) { table->file->extra(HA_EXTRA_NO_CACHE); - table->file->delete_all_rows(); + table->file->ha_delete_all_rows(); table->file->extra(HA_EXTRA_WRITE_CACHE); } } |