diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 12:47:58 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 12:47:58 +0200 |
commit | ede08808e9591a6a00fe34b0801cfe6ff645ef5a (patch) | |
tree | c5b8d08fae44cf0c2f19834d429e6672a6465fd1 /storage/perfschema | |
parent | 9859d366b5dede25308b562c24316c44a6474275 (diff) | |
parent | 3c3724991e4ce802f79a8dbee2f72e3073729f2f (diff) | |
download | mariadb-git-ede08808e9591a6a00fe34b0801cfe6ff645ef5a.tar.gz |
Merge branch 'merge-perfschema-5.6' into 10.0
Diffstat (limited to 'storage/perfschema')
-rw-r--r-- | storage/perfschema/ha_perfschema.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index 95ac1c85f00..7fe4de84684 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.20", + "5.6.25", MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; |