summaryrefslogtreecommitdiff
path: root/storage/perfschema/ha_perfschema.h
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/perfschema/ha_perfschema.h
parent9809f05199aeb0b67991fac41bd86f38730768dc (diff)
downloadmariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz
post-merge fixes.
most tests pass. 5.3 merge is next
Diffstat (limited to 'storage/perfschema/ha_perfschema.h')
-rw-r--r--storage/perfschema/ha_perfschema.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/perfschema/ha_perfschema.h b/storage/perfschema/ha_perfschema.h
index c0ee0827dbc..9557bc25b6e 100644
--- a/storage/perfschema/ha_perfschema.h
+++ b/storage/perfschema/ha_perfschema.h
@@ -124,8 +124,6 @@ public:
int delete_all_rows(void);
- int truncate();
-
int delete_table(const char *from);
int rename_table(const char * from, const char * to);