summaryrefslogtreecommitdiff
path: root/storage/perfschema
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2010-10-26 11:02:32 +0200
committerMarc Alff <marc.alff@oracle.com>2010-10-26 11:02:32 +0200
commit2a4f50a5df9bc457928f07493618286814444f25 (patch)
tree2341256cd31b1bec369c51f8c21a867ddc7ac911 /storage/perfschema
parent4c929d53fa1259e6a89ca73d77d351b66f079939 (diff)
parent105fb30e1c707c09352d51fc1c7f8f7434cd9fe9 (diff)
downloadmariadb-git-2a4f50a5df9bc457928f07493618286814444f25.tar.gz
local merge
Diffstat (limited to 'storage/perfschema')
-rw-r--r--storage/perfschema/ha_perfschema.cc5
-rw-r--r--storage/perfschema/ha_perfschema.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc
index e5e324d6c6b..896117397a2 100644
--- a/storage/perfschema/ha_perfschema.cc
+++ b/storage/perfschema/ha_perfschema.cc
@@ -345,6 +345,11 @@ 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 2c7b45fbbf7..1a0c16541be 100644
--- a/storage/perfschema/ha_perfschema.h
+++ b/storage/perfschema/ha_perfschema.h
@@ -127,6 +127,8 @@ public:
int delete_all_rows(void);
+ int truncate();
+
int delete_table(const char *from);
int rename_table(const char * from, const char * to);