summaryrefslogtreecommitdiff
path: root/storage/tokudb/ha_tokudb.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-12-21 16:36:10 +0100
committerSergei Golubchik <serg@mariadb.org>2015-12-21 16:36:10 +0100
commit05dc86c09fb2e001ac80654a97c0870eee6aea82 (patch)
treeccc8958214c21e9bc374ba4262a56d4703ffefc5 /storage/tokudb/ha_tokudb.cc
parent865548fc8d0574e6418b66def39b6d36bbc0205a (diff)
parente126baafbc78f15c794082f0a93740d81041d038 (diff)
downloadmariadb-git-05dc86c09fb2e001ac80654a97c0870eee6aea82.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage/tokudb/ha_tokudb.cc')
-rw-r--r--storage/tokudb/ha_tokudb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index 2814c54ab9d..992a1ab02d2 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -288,7 +288,7 @@ static int free_share(TOKUDB_SHARE * share) {
}
const char *ha_tokudb::table_type() const {
- extern const char * const tokudb_hton_name;
+ extern const char *tokudb_hton_name;
return tokudb_hton_name;
}