summaryrefslogtreecommitdiff
path: root/storage/perfschema
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-04-26 14:11:39 +0200
committerSergei Golubchik <serg@mariadb.org>2018-04-26 14:12:13 +0200
commit584137879f00c4d532b1b2b76f754af3061017be (patch)
tree4048698e3ef4c63aa2635dc0b5f44367665792f0 /storage/perfschema
parent15ec8c2f28f08517ecbffb959d756b4bdd53ab45 (diff)
parent7fcd9660a20c47a42860a6ca5e79cabcb38e5784 (diff)
downloadmariadb-git-584137879f00c4d532b1b2b76f754af3061017be.tar.gz
Merge branch 'merge-perfschema-5.6' into 10.0
Diffstat (limited to 'storage/perfschema')
-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 837a2463549..ec41cb2203b 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.36",
+ "5.6.40",
MariaDB_PLUGIN_MATURITY_STABLE
}
maria_declare_plugin_end;