summaryrefslogtreecommitdiff
path: root/storage/heap/ha_heap.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-07-02 22:12:12 +0200
committerSergei Golubchik <sergii@pisem.net>2011-07-02 22:12:12 +0200
commitb4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch)
tree18a0c25fdc9ac0076da19247666414a46434b85e /storage/heap/ha_heap.cc
parent9809f05199aeb0b67991fac41bd86f38730768dc (diff)
downloadmariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz
post-merge fixes.
most tests pass. 5.3 merge is next
Diffstat (limited to 'storage/heap/ha_heap.cc')
-rw-r--r--storage/heap/ha_heap.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index fc6e89e54e0..e16a5e38a0f 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -455,13 +455,6 @@ int ha_heap::delete_all_rows()
}
-int ha_heap::truncate()
-{
- int error= delete_all_rows();
- return error ? error : reset_auto_increment(0);
-}
-
-
int ha_heap::reset_auto_increment(ulonglong value)
{
file->s->auto_increment= value;