summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-09-27 19:00:08 +0200
committerSergei Golubchik <serg@mariadb.org>2016-09-27 19:00:08 +0200
commit2e914acb7862a49db577adb29a4a1e5712991a29 (patch)
tree0bb5ed9fca77f2735e9d234b3b72fb6fc030191d /storage
parentbb8b658954489d0933b477b246ebb110ee3642b6 (diff)
parente3124a8cd79f3639e6159d1fbf87579c3e2b3ebb (diff)
downloadmariadb-git-2e914acb7862a49db577adb29a4a1e5712991a29.tar.gz
Merge branch 'merge/merge-perfschema-5.6' into 10.0
Diffstat (limited to 'storage')
-rw-r--r--storage/perfschema/ha_perfschema.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc
index 444de87ba8b..2445bd80927 100644
--- a/storage/perfschema/ha_perfschema.cc
+++ b/storage/perfschema/ha_perfschema.cc
@@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
0x0001,
pfs_status_vars,
NULL,
- "5.6.32",
+ "5.6.33",
MariaDB_PLUGIN_MATURITY_STABLE
}
maria_declare_plugin_end;