diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /storage/perfschema | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/ha_perfschema.cc | 5 | ||||
| -rw-r--r-- | storage/perfschema/ha_perfschema.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index ec063b782c1..2113a28d4f8 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/storage/perfschema/ha_perfschema.cc @@ -361,11 +361,6 @@ int ha_perfschema::delete_all_rows(void) DBUG_RETURN(result); } -int ha_perfschema::truncate() -{ - return delete_all_rows(); -} - THR_LOCK_DATA **ha_perfschema::store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type) 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); |